diff --git a/drizzle.config.ts b/drizzle.config.ts
index 117e93e..f5f2c7e 100644
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@@ -5,11 +5,7 @@ import { defineConfig } from 'drizzle-kit'
 export default defineConfig({
 	dialect: 'postgresql',
 	out: './src/lib/server/api/databases/migrations',
-<<<<<<< HEAD
-	schema: './src/lib/server/api/databases/tables/*.table.ts',
-=======
 	schema: './src/lib/server/api/databases/tables/index.ts',
->>>>>>> 5849219833a6b9a99ec24a960962c4c537e93748
 	dbCredentials: {
 		host: env.DATABASE_HOST || 'localhost',
 		port: Number(env.DATABASE_PORT) || 5432,