commit local changes to .emacs
merge the conflicted .emacs file