gitignore and tmp files fixe
merge conflict