timer probs
timer merge