utvideodec: resolve conflicts