fixed merge corruption

fixed merge corruption