fix merge problem