aa
Merge branch 'origin/master'

Conflicts:
	dir2/file2.txt
aa
Merge branch 'origin/master'