resolve gitignore conflict