[FIX] fix wrong conflict resolution in merge

The merge #5142037 from odoo/master in local branch was wrong.
I basically overwrote the changes from master.  This commit resolves
the issue correctly.