Edit best-friend.txt
Merge conflict resolved