remove invalid file
add file1
Merge branch 'branch2' into branch1

Conflicts:
	file1.txt