A group-envy-free allocation is also envy-free, since X and Y can be groups with a single agent.
Group-envy-freeness is much stronger than the combination of these two criteria, since it applies also to groups of 2, 3, .., n-1 agents.