remove remnants of unsuccesful git rebase