branch_test
branch commit
marge
Merge branch 'test_branch'

Conflicts:
	sample_commit.txt