After resetting the ElectrumABC github repository to its state just before the monorepo migration, then applying [[this patch | https://github.com/Bitcoin-ABC/ElectrumABC/commit/3389f5e4ab5dfca8ddff451a4ef5b3badee5c958]], there should no longer be any conflicts caused by the "[electrum] initial monorepo integration" commit.