checking in branch1.cs in branch1
commiting branch2 changes
Merge remote-tracking branch 'remotes/origin/branch1' into branch2

Conflicts:
	MvcApplication1/MvcApplication1.csproj