Yes, you can use `git reset` to a previous commit before the merge, or `git revert` to create a new commit that undoes the merge.