changes groups_user to friendship so its easier to understand the verbage
fixed conflics