added 'chat with a friend
resolved conflicts