fix merge 1