gitk ... search for the last commit before the merge
git checkout <sha1-of-this-commit>
git branch <newbranchname>
git checkout <newbranchname>
git merge <branch-which-original-is-merged>
... redo the conflict resolution