Change best friend
Fix merge conflict