merge changes for timer to push from server to all clients