diff --git a/package.json b/package.json
index 1bdcf70..c8f7485 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-dto",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "A small dto lib for nodejs",
   "main": "src/index.js",
   "scripts": {
diff --git a/src/index.js b/src/index.js
index 77d1536..f891ae3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -149,14 +149,9 @@ module.exports = {
             }`
           );
         }
-<<<<<<< HEAD
 
         return sql;
       },
     };
   },
 };
-=======
-    }
-}
->>>>>>> 1fb6beaf81dc6eee7b1bbbb52de1b2b964a71695