updated best friend
merge conflict