clean  +
clean +
Change back
Merge remote-tracking branch 'origin/master'
More test
Merge remote-tracking branch 'origin/master'

Conflicts:
	another.txt