diff --git a/deploy/ubm_schema.sql b/deploy/ubm_schema.sql
index 39c0d46..09ed52a 100644
--- a/deploy/ubm_schema.sql
+++ b/deploy/ubm_schema.sql
@@ -49,6 +49,11 @@ CREATE TYPE tps."DCARD" AS (
 COMMENT ON TYPE tps."DCARD" IS 'Discover Card';
 
 
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> master
 --
 -- Name: DMAPI; Type: TYPE; Schema: tps; Owner: -
 --
diff --git a/readme.md b/readme.md
index 3577ff5..5b10424 100644
--- a/readme.md
+++ b/readme.md
@@ -10,6 +10,7 @@ The goal is to:
 It is well suited for data from outside systems that 
 * requires complex transformation (parsing and mapping)
 * original data is retained for reference
+* don't feel like writing a map-reduce
 
 use cases:
 * on-going bank feeds