Fixed small merge bug

Timer functionality should be working fully