resolving multyuser conflicts after adding to gitignore