preparing to merge
merging
merging
collaborator model attributes added
collaborators added to idea edit view