branch1 commit2

added the second line to doc2 (possibly conflicting with branch2
commit1)
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	doc2.txt