diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java
index 567f19b0..2256ee60 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java
+++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java
@@ -1,12 +1,8 @@
 package com.dbnt.faisp.main.counterIntelligence.mapper;
 
-<<<<<<< HEAD
 import com.dbnt.faisp.main.counterIntelligence.model.CiWorkStatistics;
-=======
 import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity;
->>>>>>> f44d4498869b8f15bd214aeb366c9304b59ff7a6
 import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork;
-import com.dbnt.faisp.main.faRpt.model.FaRptBoard;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java
index 844b0f68..fe8d18a1 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java
+++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java
@@ -3,11 +3,8 @@ package com.dbnt.faisp.main.counterIntelligence.service;
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.config.FileInfo;
 import com.dbnt.faisp.main.counterIntelligence.mapper.CounterIntelligenceMapper;
-<<<<<<< HEAD
 import com.dbnt.faisp.main.counterIntelligence.model.CiWorkStatistics;
-=======
 import com.dbnt.faisp.main.counterIntelligence.model.CiaFile;
->>>>>>> f44d4498869b8f15bd214aeb366c9304b59ff7a6
 import com.dbnt.faisp.main.counterIntelligence.model.CiwFile;
 import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity;
 import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork;
diff --git a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml
index 7e79591c..204ead99 100644
--- a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml
+++ b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml
@@ -174,5 +174,5 @@
 	    ORDER BY cia.ci_key DESC
 	)a
   </select>
-  
+
 </mapper>
\ No newline at end of file