reinitialized git repo
resolved conflict in .gitignore