Don't produce spurious conflict messages when setting none (noop remove)