bad merge fix

fixed merge; removed "clobbers"