change the .gitignore to start merging