mybranch mybranch.txt
branch master.txt
add hotfix in branch hotfix
Merge branch 'mybranch'
in up, add in README.md
in down, append in README.md
Merge branch 'down'

Conflicts:
	README.md