working on groups and users relationship
resolved conflicts
working relationship between groups and users
merged conflicting changes