cc
Merge branch 'origin/master'

Conflicts:
	dir1/file1.txt