Fixed merge bug, timer should work now.