merge client.java
xml files