modify A.java
Merge branch 'test'

Conflicts:
	src/A.java
update