Resolve conflicts in app/controllers/groups/group_members_controller.rb and app/controllers/projects/project_members_controller.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>