add baseline func
fix merge