Prince | handling conflicts during delta