update resolve conflict

src/main/java/com/billpaymentservice/bbps/controller/ComplainController.java

@@ -35,7 +35,7 @@ public class ComplainController {
 	public ComplainController(ComplainService complainService) {
 		this.complainService = complainService;
 	}
-
+    
 	@PostMapping(value = "/addComplain", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> addComplain(@Validated @RequestBody ComplaintRequestDTO complainRequestDTO) {
 
@@ -82,5 +82,4 @@ public class ComplainController {
 	public ResponseEntity<ResponseModel> getAllStatuses(@Validated @RequestBody AllMasterOptionsRequest request) {
 	    return ResponseEntity.ok(complainService.getAllActiveStatuses(request));
 	}
-
 }