China Shipping Merger Still Leaves Capacity Challenge in Place