Adding Group Recommendation
Fixing Conflicts