Fixes merge conflicts
.gitignore is now working