Unfortunately the two LUA files edited by this mod are also modified by CQUI; Civ6Common.lua and UnitFlagManager.lua. The first isn't a big deal, the only change is to disable unit swapping, which can be annoying when you're expecting a unit to stack. The second however deals with adding flag functionality for the new unit formation classes. I haven't ever used CQUI so I don't know what it changes in the flag manager, so I don't even know if merging the two would be possible.