fixed trade requests
fixed merge