fixed conflics
again
changes friendship to friendships
conflics