fixing a merge issue that i missed