If it's ok to overwrite modified files, then you can enable the following option:
Studio > Settings > System > SITE SETTINGS > Force site and module auto-update, even if some files were modified
Then try to upgrade again
M
I keep forgetting about that switch Alex, thank you!