time remains when timer is stopped
Merge branch 'new_branch_name'