timer correction
resolved conflict