Fixed final merge issue with repeated getFriends method