stash text
Merge branch 'test'

Conflicts:
	2.txt