resolve conflict
resolve conflict

fix typo

greenfield-innovation/greenfield-innovation.github.io,greenfield-innovation/greenfield-innovation.github.io,greenfield-innovation/greenfield-innovation.github.io