The command to return to the pre-merge state when conflict occurs during git merge is:

git reset --hard ORIG_HEAD

That’s all from the Gemba, where I occasionally have opportunities to use this and was looking it up every time.