update frame count by elapsed time
merge conflict