fixed trade issues
fixed conflicts
fixed changes to trade