Add config to .gitignore
merge conflict