Changes as a result of some more conflict resolution