no add user button when user already in group
fix merge conflicts