Restoring .gitignore after a mistake at merge