bransh 2  test 1
bransh 2   test 2
Merge branch 'origin/branch2'

Conflicts:
	Test Besgtand.txt