I am running Odoo 13. I created a new staging branch and used the Odoo.sh editor to make changes to primary_variables.scss (/src/odoo/addons/web/static/src/scss/primary_variables.scss). I save the file and update current module and I can see the changes reflected on my instance. Where I am stuck is merging these changes from staging into production. When I try to merge my staging branch into my production branch it says "Nothing to merge". I can navigate to the /src/odoo/  and use the odoo.sh terminal to commit the changes but it still says "nothing to merge" when I try to drag and drop the staging branch into the production branch. What am I doing wrong?