Chinese firm Global Law Office has agreed to merge with a Shanghai-based trade and customs boutique amid a continuing escalation of a brewing trade war between the U.S. and China.

On Sept. 1, HaoLiWen Partners will merge with the Global Law Office. The Shanghai shop, which also has offices in Beijing and Dublin, was founded in 2003. A full-service firm, HaoLiWen is best known for its foreign investment and trade practices.