content of test branch.
Merge branch 'test_branch'

Conflicts:
	README.md
test resolving the commits from different branch.