Add clearTimeout to prevent unever speed problem
Fix merge conflict