conflicting commit from master
conflicting commit from bug-fix-2
Merge branch 'refs/heads/bug-fix-2'

Conflicts:
	Hello.txt.txt