Updating trades
fixing merges