Adding Basic Chat, B@ bot
solve conflict