updated phases and education
resolved conflicts