timer implemented
merge