Unfortunately your base is older than the one in the current master and I am afraid this won't automerge nicely. Can you do a rebase discarding your changes in order to not modify the webinos_config with your pr?