[GordonS]

I use Rider, and this has saved me multiple times!

JetBrains IDEs also have the best UI I've come across for conflict merges.