fixing gitignore conflict