Branch1 pour test conflit
Branch2, pour tester conflit
Merge branch 'my_branch1' into my_branch2

Conflicts:
	Hello.txt
Merge branch 'master' of github.com:constint/LOLEMN into new_branch