commit before conflict
Merge https://github.com/mikeisblack/projetTest

Conflicts:
	projet/fichier1.txt