use finish resume
fix time
rm unused
Merge branch 'resume'