Collaborator disfunction
Added Collaborator functionality
Collaborator Function Merge
Fix edit
Fix merge conflict
Collaborator cleanup