typos
Merge branch 'Emergent-Architecture-Design-V3'
solving merge conflict