update resume
fix merge conlicts