add new time too
resolve the conflict