deleted Friendship scaffold, errors with merging?