actually fixed merge conflicts
actually fixed merge conflicts

mozilla/butter,mbuttu/butter,BBGInnovate/butter,robinparadise/videoquizmaker,robinparadise/videoquizmaker,BBGInnovate/butter,mbuttu/butter,mozilla/butter,mbuttu/butter