changed the upload token to not be mock tocken
fixed merge issues