fixed merge conflicts in .gitignore