diff --git a/model/ddl_0_component_type.sql b/model/ddl_0_component_type.sql
index efd7e6d..0192f5b 100644
--- a/model/ddl_0_component_type.sql
+++ b/model/ddl_0_component_type.sql
@@ -1,14 +1,8 @@
 -- standard component type 
 
-<<<<<<< HEAD
 DROP TABLE IF EXISTS PUBLIC.COMPONENT_TYPE;
 
 CREATE TABLE PUBLIC.COMPONENT_TYPE (
-=======
-DROP TABLE IF EXISTS COMPONENT_TYPE;
-
-CREATE TABLE COMPONENT_TYPE (
->>>>>>> dd3c6eb (add and update)
     ID SERIAL PRIMARY KEY,
     TYPE VARCHAR(64) NOT NULL DEFAULT '',
     NAME VARCHAR(64) NOT NULL DEFAULT ''