added timer config
merge
done