added education deatil and update profile
solve conflict