fix conflicts in gitignore