Merging branches with Odoo.sh

see: https://somup.com/cThVfXMnLf