Update timer.js

fixed merge issues