Conflicts: oscar/checkout/views.py oscar/services.py Fixed conflicts which were just docstring related