Added file1
Added file2
Updated file1
Added file3
Modifed file1
Merge branch 'master' into branch1

Conflicts:
	file1.txt
Modified file3