change my1
Merge branch 'mytest'

Conflicts:
	my.txt

text