Branch2 second commit
Branch2 third commit
Merge branch 'Branch2' into Branch1

Conflicts:
	repo1text.txt