Updated trade details
resolve conflicts