iii:
iiMerge branch 'b1'

Conflicts:
	WebRoot/WEB-INF/classes/com/xyz/Test.class
	src/com/xyz/Test.java
new class