reverted unmatching merge