services: wm: fix merge conflict