Resolved conflict in .gitignore