update code resolved conflict

src/main/java/com/billpaymentservice/bbps/repository/BillInitateRepository.java

@@ -1,5 +1,7 @@
 package com.billpaymentservice.bbps.repository;
 
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -8,4 +10,8 @@ import com.billpaymentservice.bbps.entites.BillInitiate;
 @Repository
 public interface BillInitateRepository extends JpaRepository<BillInitiate, String> {
 
+	 Optional<BillInitiate> findByTxnId(String clientReqId);
+
+	 Optional<BillInitiate> findByReqId(String clientReqId);
+
 }

src/main/java/com/billpaymentservice/bbps/repository/BillerDataRepository.java

@@ -5,11 +5,10 @@ import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-
 import com.billpaymentservice.bbps.entites.BillerDetails;
 
 @Repository
 public interface BillerDataRepository extends JpaRepository<BillerDetails, String> {
-	
+
     Optional<BillerDetails> findByBillerId(String billerId);
 }

src/main/java/com/billpaymentservice/bbps/repository/PaymentIntiateRepository.java

@@ -1,9 +1,13 @@
 package com.billpaymentservice.bbps.repository;
 
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.billpaymentservice.bbps.entites.PaymentInitiate;
 
 public interface PaymentIntiateRepository extends JpaRepository<PaymentInitiate, String> {
 
+	Optional<PaymentInitiate> findByReqId(String clientReqId);
+
 }