update resume
merge conflicts