adds add and remove friendship
fixed one conflict