changed best friend name in best_friend.txt
fixed merge conflict best_friends.txt