local code for pull
merge
merge
Ignore emacs backup files