[#56629066] change video embed
[#56629066] Solve conflict