vqavideo: resolve conflicts