git problem : You are in the middle of a conflicted merge

Fix merge conflicts

git reset --hard HEAD
git fetch origin
git reset --hard origin