As deleting objects with conflict on leads to inconsistant data -> exceptions, I think we have to do something against it.
I think this is one reason why it was impossible to merge two offline edited osm file with partly same objects (for example route relations but a single way might be enough).