added educations
cleared merge conflicts