Added tmp/ folder to ignored folders
Resolved .gitignore conflict