fixing a problem with the merge