Update DerbyMergeClient.java