commit test3
commit test3 b
commit test4
Merge branch 'test_branch_local'

Conflicts:
	test.txt