start and stop and times
resolve conflicts
resolve conflicts