diff --git a/deploy/ubm_schema.sql b/deploy/ubm_schema.sql
index 09ed52a..39c0d46 100644
--- a/deploy/ubm_schema.sql
+++ b/deploy/ubm_schema.sql
@@ -49,11 +49,6 @@ CREATE TYPE tps."DCARD" AS (
 COMMENT ON TYPE tps."DCARD" IS 'Discover Card';
 
 
-<<<<<<< HEAD
-=======
-
-
->>>>>>> master
 --
 -- Name: DMAPI; Type: TYPE; Schema: tps; Owner: -
 --