add files
Merge branch 'branch1'

Conflicts:
	file.txt
	file2.txt