samsung video: clean up merge