s
asdd
Merge branch '21'

Conflicts:
	doc1.txt