starting over
gitignore conflict resolved