edit A for conflict
Merge remote-tracking branch 'origin/B1' into B1

Conflicts:
	src/com/sample/ClassA.java
conflict
Merge remote-tracking branch 'origin/B1' into B1

Conflicts:
	src/com/sample/ClassA.java
conflict
Merge remote-tracking branch 'origin/B1' into B1

Conflicts:
	src/com/sample/ClassA.java
conflict