updated resume
merged