msm: mdp: fix conflicts

Signed-off-by: helicopter88 <johnlemon.lol@gmail.com>