Branch 2 Change
Branch 1 Changes
Merge branch 'Branch1'

Conflicts:
	new  2.txt

Signed-off-by: unknown <brian110@HOPCVM467.sficorp.com>
Signed-off-by: unknown <brian110@HOPCVM467.sficorp.com>
Merge branch 'Branch1'
Main Change
Branch 2
Merge branch 'Branch2'

Conflicts:
	new  2.txt
Test
Tester
Merge branch 'Branch1'

Conflicts:
	new  1.txt