edit file1 by 1
Merge branch 'master' of https://github.com/hkubo/testrepo

Conflicts:
	file1.txt