Trying to reset git repo
Fix merge conflicts