add emacs backup to gitignore.
merge conflict.
fix.