Added intellij .idea to .gitignore and the emacs temp file
Merge fixes