BOOT_SWAP_USING_MOVE set more than once.

I have just upgraded my project to NCS 3.1.0 and I'm now getting this error

BOOT_SWAP_USING_MOVE (defined at C:/ncs/v3.1.0/bootloader/mcuboot/boot/zephyr/Kconfig:575) set more than once.

If I look at that file in the build directory I do indeed see conflicting settings

# sysbuild controlled configuration settings
...
CONFIG_SINGLE_APPLICATION_SLOT=n
CONFIG_BOOT_SWAP_USING_MOVE=n
CONFIG_BOOT_SWAP_USING_SCRATCH=n
CONFIG_BOOT_UPGRADE_ONLY=n
...
CONFIG_SINGLE_APPLICATION_SLOT=n
CONFIG_BOOT_SWAP_USING_OFFSET=n
CONFIG_BOOT_SWAP_USING_SCRATCH=n
CONFIG_BOOT_UPGRADE_ONLY=n
CONFIG_BOOT_SWAP_USING_MOVE=y
...
I don't set these values in my own config file as far as I can tell, so looks like this conflict comes from NCS 3.1.0 itself
Am I doing something wrong?
Simon
Related