vp56: update to new api / resolve conflicts