Removing duplicate merge mistakes