Corrected the MsgEncoder merge error.