Conflicts: oscar/apps/dashboard/catalogue/views.py oscar/apps/dashboard/offers/views.py oscar/apps/dashboard/orders/views.py