fixed merge conflicts
before merge
uploads done