Reset repo
Fixing merge conflict