fixing a merge issue that was causing tests to fail