fix merge 3