Made the name in best_friend better
Fixed the merge issue