Feature two. Commit 1
Feature two. Commit 2
Merge remote-tracking branch 'origin/2-feature'

Conflicts:
	README.md