update res
unwatch when error
Merge branch 'lifecycle'