Change six
a non conflict message
Merge branch 'feat/Kezz' of github.com:kezz90/hello-world into feat/Kezz