cherry pick
2ème commit

Conflicts:
	new.txt