[Spce-user] Error during upgrade mr11.3.1 to 11.5.1

[cappellari at connectlife.it]

Hi guys, I'm upgrading from mr11.3.1 to 11.5.1

During the second stage of upgrade I get the following error:

2023-12-03 18:56:35: [46/58] 'spce' Running: /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
Checking remote 'upgrade_origin'...
Remote 'upgrade_origin' detected, skipping creation...
Getting commits from old partition
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
ERROR: the step 'mr9.5/merge_commits_from_fallback' failed, upgrade aborted!
Please fix the root of the issue and restart 'ngcp-upgrade'
(see error details in log file /ngcp-data/ngcp-upgrade/mr11.3.1-mr11.5.1/logs/ngcp-upgrade-mr11.3.1-mr11.5.1-1701626193.log ).

You can help me?
Thank you