As a thought experiment, what would happen if the first invoked stage operation of `add -p` nuked the stage-1/2/3 versions? Would this work? The file would be recorded as no longer conflicting, is that too footgunny? Apologies for the double-send and top-posting, Chris; I responded from my phone's gmail without thinking. Jarrad