gitignore changed back because of conflicts