fix mismerge in msm_mdp.h