diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
index 552e9a6..bb087b8 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
@@ -136,9 +136,9 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
         pageable: Pageable
     ): Page<JobOrderInfo>
 
-<<<<<<< HEAD
+
     fun findAllByStatusIn(statuses: List<JobOrderStatus>): List<JobOrder>
-=======
+
     @Query(
         nativeQuery = true,
         value = """
@@ -177,5 +177,5 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
         """
     )
     fun findJobOrderByProdScheduleLineId(prodScheduleLineId: Long): JobOrderDetailWithJsonString?;
->>>>>>> origin/master
+
 }
\ No newline at end of file