Delete test.txt
Create teste.txt
Update teste.txt
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bdic3/test.txt