diff --git a/SqlManagement/Diagrams/global.erd b/SqlManagement/Diagrams/global.erd
index 723bccb..187dbeb 100644
--- a/SqlManagement/Diagrams/global.erd
+++ b/SqlManagement/Diagrams/global.erd
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<<<<<<< HEAD
 <diagram version="1" name="global.erd">
 	<entities>
 		<data-source id="postgres-jdbc-1948450a8b4-5fc9eec404e65c44">
@@ -21,4 +22,9 @@
 		<relation name="tenants_created_by_fkey" fq-name="swp.tenants.tenants_created_by_fkey" type="fk" pk-ref="3" fk-ref="1"/>
 		<relation name="user_tenants_user_id_fkey" fq-name="swp.user_tenants.user_tenants_user_id_fkey" type="fk" pk-ref="3" fk-ref="2"/>
 	</relations>
+=======
+<diagram version="1" name="global">
+	<entities/>
+	<relations/>
+>>>>>>> origin/main
 </diagram>
\ No newline at end of file