fixed conflicts in order_queue.