Fixing merge conflict in group.php