Use the internal merge tool

I guess at some point I'll learn how to use vimdiff or install a
good merging tool