Fixing gitignore conflict