id:1 Doing some stuff
id:1 Doing some more stuff
Merge branch 'US1_MyFirstFeatureBranch'

Conflicts:
	the-file.txt