fixing a merge problem