fixes in bad merge