Before this commit the merge operation did not decide which entry to keep. After this commit the merge is solved. #63534 closes odoo/odoo#63553 X-original-commit: 33a482be1aa7162f446ff5cdda35ba2f7ce1f273 Related: odoo/design-themes#434 Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>