file1.txt v3
Merge branch 'master' of https://github.com/dtglbt/test1

Conflicts:
	file1.txt