msm: mpd: Fix writeback merge conficts.