Update item_trade.txt

removed merge conflicts from this item_trade.txt