schedule updates
resolved conflict