bad merge fixes