fix merge 2