migrated database
fixed merge conflict
began dynamic video information