Update ClientProxyMerlinsLegacy.java