update the pub
fixed conflict merge