h264: resolve conflicts