I ended up preparing a manual merge of my local changes to main. I am being hopeful that this may make the previous merge easier.
After applying the changes, I'd suggest to do a second merge with your master branch, as it contains changes from @vdavid. We should probably remove "master" afterwards, so that this doesn't happen again.
