one on one trade seems to work (unless price limits are too far apart)
resolved mini merge conflict