The 7th commit and should be conflict
Merge branch 'master' of https://github.com/duchuunguyen/hello-world