update simpleTimer class
fix merge conflict