Experimenting with the conflict solver

I was thinking about adding a simpler conflict solver, where you wouldn’t have to
delete the <<<<<<<, ======= and >>>>>>> markers yourself but would just pick
either the first or the second version.

But I realized it would be messier than I thought, so in the end I kept it as a
basic editor where you remove the version you don’t want by hand.