commiting branch2 changes
Merge remote-tracking branch 'remotes/origin/branch1' into branch2

Conflicts:
	MvcApplication1/MvcApplication1.csproj
added first change
Merge branch 'branch1' into branch2

Conflicts:
	MvcApplication1/Models/Branch1.cs
change 1

Conflicts:
	MvcApplication1/Models/Branch1.cs
added change
made new change
changed new class added
Merge branch 'branch1' into branch2

Conflicts:
	MvcApplication1/Models/Branch1.cs
commit in branch2 itself
adding changes to branch 1
add
b1
test

test
Made change to Branch 2
Made change to Branch 1
test commit
testrename2
dasfdfdas
dfsdfdsf