my feature
test merg
Merge branch 'myfeature' into devtest

Conflicts:
	testmerg.txt