Some time ago, when fixing yet another merge conflict, I noticed something I didn’t know about: it turned out that Emacs enabled something called Smerge mode in the buffer with the conflict markers. I pressed C-h m and learned that it’s quite useful! You can easily leave one or the other version (at each conflict), concatenate both versions (effectively deleting the conflit markers), move to the previous or next conflict etc. I did not analyse all of its commands yet, but even this limited subset is very useful. Also, Smerge mode turned itself off after resolving (this way or another) the last remaining conflict. Very nice!