edit3
edit 3
merge conflict incoming
Merge branch 'newbranch2'

Conflicts:
	repo1/BranchTest.java