oops resolving git conflicts in gitignore file