update to LocalBranch1
update to LocalBranch2
another change on LocalBranch2
Merge branch 'LocalBranch2'

Conflicts:
	file1.txt