adding angular timer
fixed merge issue