first change to the rouge branch
editing the local branch
Merge branch 'myBRanch'

Conflicts:
	hello.txt