fixed cancel pending trades involving traded items
fixed merge for cancel pending trades