Fix to make sure edited bots are saved.
Fixed merge conficts