lab 2: finished merging the changes
for OrderController.