new resume
fixed merge conflicts