Fixes OrdersController to properly reference the hash keys rather than the old way of using an array
Resolves merge conflict