git undo comflicted rge

git merge --abort
Tense Trout