add work experience, education
merge conflicts fixed