Resolve conflicts in .gitignore file