hotfix edit hello.txt
master edit hello.txt
Merge branch 'hotfix'

Conflicts:
	hello.txt
Merge branch 'master' of github.com:duongNA/git-first