this is file in xiaodong2
and me too
hey!  i write something here
this is a new file.
another new file
this is file1 from git but
I HAVE CHANGED file1.txt a little
changes to support the development of master
Merge branch 'master' into somebranch

Conflicts:
	file1.txt