added item
branch 1 something
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	TestMerge/TestMerge/Test1/Class1.cs