Branch1 pour test conflit
Merge branch 'my_branch1' into my_branch2

Conflicts:
	Hello.txt