test commit to branch 2
make a change to a branch which I created locally
Merge branch 'test_branch_2' into local_branch_3

Conflicts:
	README
manually sorted the conflicts

Signed-off-by: AndyNesling <andrew.nesling@navetas.com>