Modify .gitignore
Fix conflicts