updated resume
conflictzzz