Commit to create conflict
Merge branch 'master' of https://github.com/newsoulbr/gitminicourse