fixing bad merge