Change friends.txt
Attempt merge