add_marionette, fix version conflicts