trade updated
merge conflict