diff --git a/src/main/resources/sql/mapper/base/file-mapper.xml b/src/main/resources/sql/mapper/base/file-mapper.xml
index f44e5572..485974dd 100644
--- a/src/main/resources/sql/mapper/base/file-mapper.xml
+++ b/src/main/resources/sql/mapper/base/file-mapper.xml
@@ -102,16 +102,9 @@ SELECT NEW_ID
      , CONCAT(DIR, NEW_ID, '.', #{file.extension}) PATH
   FROM (
        SELECT NVL(MAX(FILE_ID) + 1, CONCAT(THIS_DAY, '00001')) NEW_ID
-<<<<<<< HEAD
          FROM (<include refid="utility.selectThisDay" />) B LEFT OUTER JOIN
               TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%')
        ) T1, (
-=======
-         FROM (<include refid="utility.selectThisDay" />) B 
-         LEFT OUTER JOIN TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%')
-       ) T1
-     , (
->>>>>>> branch 'main' of http://xit.xit-git.com:3000/xit-app/fims.git
        <include refid="fileDirs" />
         WHERE INF_TYPE = #{file.infoType}
        ) T2