deleted the emacs backup files
fixed a merge conflict