Fixed timer merge issue