new func
fix merge