Updates to the data structures
conflicts