How to merge Git conflicts in Emacs - Emacs Stack Exchange