diff --git a/src/common-components/text-block/text-block.vue b/src/common-components/text-block/text-block.vue
index 26f57d665..f8d14cd44 100644
--- a/src/common-components/text-block/text-block.vue
+++ b/src/common-components/text-block/text-block.vue
@@ -1,5 +1,5 @@
-
+
+
+
+=======
+
+>>>>>>> d1bf013... fixed remaining merge conflict
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index ed1ffd3db..a68012e17 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -6,7 +6,7 @@