repair of the merge