Merge with remote
Modify .gitignore