add collab wanted checkbox
fix merge conflicts