merge remote and fix videomode