Adding .gitignore
Fix conflicts