(Issue #3713) undoing merge conflicts