Resolving "Group" conflict