update code resolve conflict

src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java

@@ -53,4 +53,8 @@ public abstract class BaseClass {
 	private String udf9;
 	
 	private String udf10;
+    private String udf11;
+    private String udf12;
+    private String udf13;
+    private String udf14;
 }

src/main/java/com/billpaymentservice/bbps/dto/request/PaymentStartUserRequest.java

@@ -0,0 +1,26 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+// DTO representing the user request payload described by the user
+public class PaymentStartUserRequest extends BaseClass implements Serializable {
+    private String amount;
+    private String currency;
+    private String emailId;
+    private String customerVpa;
+    private String mobileNo;
+    private String respUrl;
+    private String txnReqType;
+    private String name;
+
+    
+}