remove conflicts in gitignore