removed a merge conflict I missed on merge