Creation of subject groups
Solve merge conflict