Fix typo in group_by property explanation
Fixing conflict and merging #315