msm_kcal_ctrl: fix merge error