diff --git a/__debug_bin.exe b/__debug_bin.exe
deleted file mode 100644
index 1e44444..0000000
Binary files a/__debug_bin.exe and /dev/null differ
diff --git a/saas_bot.db b/data/saas_bot.db
similarity index 100%
rename from saas_bot.db
rename to data/saas_bot.db
diff --git a/db/db.go b/db/db.go
index db16f30..7295438 100644
--- a/db/db.go
+++ b/db/db.go
@@ -11,11 +11,7 @@ var Conn *sql.DB
 
 func Init() {
 	var err error
-<<<<<<< HEAD
-	Conn, err = sql.Open("sqlite", "./saas_bot.db")
-=======
-	Conn, err = sql.Open("sqlite", "./data/bot.db")
->>>>>>> 63654c4c1b55ddcfeb4a5adf43d0a1778236c58d
+	Conn, err = sql.Open("sqlite", "./data/saas_bot.db")
 	if err != nil {
 		panic(err)
 	}