repairs error in merge