fix merge conflict best_friend.txt