Updates to resume.
fix merge problems.