update resume
merge