reinintialized git repo
new feature
resolve conflicts