msm kcal: fix merge errors