added video descriptions
fixed merge conflicts