Draft: Resolve "merge_error field for MR not being cleared"

What does this MR do and why?

We don't always clear the merge_error. Merge_error's are set when we have an error trying to merge.

Related to #33231 (closed)