Fixed gitignore conflict