fix test that failed due to a bad merge