removed client side merge and mail java code