moved isPrimary over to video join table instead of video table, and some other minor changes
moved isprimary over and fixed merge conflict with main.min.js again