fix broken test caused by bad merge