merge video part in, but still bugs exist