Field field_customer_email is unknown
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -35,7 +35,7 @@ class OffsitePaymentForm extends PaymentOffsiteForm {