Resolve "merge_error field for MR not being cleared"
What does this MR do and why?
When we transition to the merge state, then we should clear the merge_error as there is now no merge error because it is merged
Related to #33231 (closed)
Edited by Marc Shaw