issue 2 - commit 1
issue 2 - commit 2
issue 3 - commit 1
Merge branch 'feature/issue-2'

Conflicts:
	test.md