newFile en tu
Rename newFile
Merge remote-tracking branch 'origin/tu'

Conflicts:
	newFile.txt