test new branch in hello
test new branch in hello line 3
on est bien sur master
Merge branch 'newTest'

Conflicts:
	hello.txt