video maddness
fixed merge conflict