fix merge conflict with .gitignore