fixing compiler issues caused by bad merge