Improved conflict handling of add/remove object configurations in presets