tmp added to git ignore
conflict in gitignore resolved