Fixed merge errors in viewOrder.jsp