updates to resume site
Fixing merge conflicts