fixed Doku.me (plugin may be removed soon, most videos don't work)
fix merge