changed bestfriend
merged bestfriend