Auto correction time when conflict timers

Thanks Dima73