fixing a minor merge conflict