v210x: resolve conflicts