Merge
trade stat calculation