undo a merge
git revert commit_id -m 1
revert a commit
git revert commit_id
problem
the commit rwverted