Ca va entrer en conflit !
Merge remote-tracking branch 'origin/master'

Conflicts:
	dev.txt
Merge remote-tracking branch 'origin/master'