added state change
conflict resolution
conflict resolution
updated the channels and the durations