msm: mpdecision merge error fixes