Meanwhile, I'm adding conflict detection and reporting to the new sawtooth router. This is going to be very useful!