merge message handing update