fixed another merge issue and made sure the tests passed