diff --git a/backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java b/backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java
index 3feb224..7edb3b3 100644
--- a/backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java
+++ b/backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java
@@ -63,10 +63,7 @@ public class ReportController {
         return new ResponseEntity<>(detailReport, HttpStatus.OK);
     }
 
-<<<<<<< HEAD
 
-=======
->>>>>>> 935331e7e93d9c25ec6f32ba6155ed19b5fd60f9
     @GetMapping("/teacher/reportSet/{lectureId}")
     public ResponseEntity<List<ReportSetResponse>> searchReportSets(@PathVariable("lectureId") long lectureId) {
         List<ReportSetResponse> reportSetResponses = reportService.findReportSets(lectureId);
@@ -88,7 +85,7 @@ public class ReportController {
     }
 
     @DeleteMapping("/teacher/report/{reportSetId}")
-    public ResponseEntity<?> deleteReportSet(@PathVariable("reportSetId") UUID reportSetId, HttpServletRequest request){
+    public ResponseEntity<?> deleteReportSet(@PathVariable("reportSetId") UUID reportSetId, HttpServletRequest request) {
         String token = request.getHeader("Authorization");
         long userId = Long.parseLong(jwtUtil.getUserId(token));