can now add members to groups
solved merge conflict