Fixed some issues with the timer and merge problems