changes bestfriend.txt
changes merge