edit resume
merge