remove gitignore conflict file