fixing a merge related problem