main updated, getcollaborators updated, authentication updated
merge