Addtobot

Fixed merge conflicts