20 seconds
sync with server time
bug fix
merge conflict