Merge conflicts on NotificationsDisplayerUIX when upgrading XWiki from 9.11.4 to 10.4 on MySQL

STEPS TO REPRODUCE

Preconditions: An instance of XWiki 9.11.4 and an instance of XWiki 10.4 (to which will be migrated) are available.

1. Go to the newer instance (e.g. 10.4) and copy/cut the

   [...]webapps\xwiki

   folder and replace it (first delete the old one) in the same location on the older version

1. Start the instance and follow the Distribution Wizard through the upgrade process

EXPECTED RESULTS

The upgrade process is completed successfully without errors.

ACTUAL RESULTS

On Step 2 - Flavor is displayed a merge conflict related to the page XWiki.Notifications.Code.NotificationsDisplayerUIX (screenshot attached).

The issue was reproduced only on MySQL (5.7) DB.