Fixing bad push to git which contained an unmerged commit. Assuming the HEAD version is the intended one.