resolved Conflict

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

@@ -0,0 +1,9 @@
+package com.billpaymentservice.bbps.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.billpaymentservice.bbps.entites.ComplaintDetails;
+
+public interface ComplainRepository extends JpaRepository<ComplaintDetails, String> {
+
+}