fix code broken by bad merge