Fix conflict in .gitignore