Update resume.
Fix merge conflicts in resume update.