Conflit partie 1
Partie 2 du conflut
Merge branch 'test/conflit2' into develop

Conflicts:
	ajout.txt