Please enter the commit message for your changes. Lines starting
commit feature-conflict
conflict master
Merge branch 'feature-conflict'

Conflicts:
	test.txt