Cause a conflict
Fix .gitignore conflict