Fix merge bug in FriendsHelper