Merging conflicts in gitignore