fix merge err