diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index ad3769ce..84b8ecb0 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -112,14 +112,7 @@
         <result column="overTime2" jdbcType="INTEGER" property="overTime2" />
         <result column="flag" jdbcType="INTEGER" property="flag" />
         <result column="countNum" jdbcType="INTEGER" property="countNum" />
-<<<<<<< HEAD
         <result column="handleTimeMax1" jdbcType="NVARCHAR" property="handleTimeMax1"/>
-
-=======
-        <result column="C1" jdbcType="NVARCHAR" property="C1" />
-        <result column="C9" jdbcType="NVARCHAR" property="C9" />
-        <result column="T3" jdbcType="NVARCHAR" property="T3" />
->>>>>>> origin/master
     </resultMap>
     <sql id="Base_Column_List">
     id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,