diff --git a/hasura/metadata/actions.yaml b/hasura/metadata/actions.yaml
index 1edb4c2ff..528453b2c 100644
--- a/hasura/metadata/actions.yaml
+++ b/hasura/metadata/actions.yaml
@@ -1,6 +1,13 @@
 actions: []
 custom_types:
+<<<<<<< HEAD
   enums: []
   input_objects: []
   objects: []
   scalars: []
+=======
+    enums: []
+    input_objects: []
+    objects: []
+    scalars: []
+>>>>>>> c1752e1 (feat: create empty hasura directory)
diff --git a/hasura/metadata/allow_list.yaml b/hasura/metadata/allow_list.yaml
index 935c07949..231e2b8e7 100644
--- a/hasura/metadata/allow_list.yaml
+++ b/hasura/metadata/allow_list.yaml
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 - collection: allowed-queries
   scope:
     global: true
+=======
+[]
+>>>>>>> c1752e1 (feat: create empty hasura directory)
diff --git a/hasura/metadata/databases/databases.yaml b/hasura/metadata/databases/databases.yaml
index 25ba5ee5b..9ad9c7a46 100644
--- a/hasura/metadata/databases/databases.yaml
+++ b/hasura/metadata/databases/databases.yaml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 - name: default
   kind: postgres
   configuration:
@@ -73,3 +74,6 @@
     type_names:
       prefix: xstaxy_
   tables: "!include xstaxy/tables/tables.yaml"
+=======
+[]
+>>>>>>> c1752e1 (feat: create empty hasura directory)
diff --git a/hasura/metadata/query_collections.yaml b/hasura/metadata/query_collections.yaml
index 499c2aaab..545fbf16f 100644
--- a/hasura/metadata/query_collections.yaml
+++ b/hasura/metadata/query_collections.yaml
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 - name: allowed-queries
   definition:
     queries: []
+=======
+[]
+>>>>>>> c1752e1 (feat: create empty hasura directory)
diff --git a/hasura/migrations/a b/hasura/migrations/a
deleted file mode 100644
index 3e932fe8f..000000000
--- a/hasura/migrations/a
+++ /dev/null
@@ -1 +0,0 @@
-34
\ No newline at end of file