change in conflict