msm: mdss: Fix merge errors