Added collaborators - did not update docs
Fixed conflicts