v210dec: resolve conflicts