Test conflict local 2
Merge remote-tracking branch 'origin/feature-xyz' into feature-xyz

Conflicts:
	Test.txt