fix accept collaborators button
fix merge conflicts