Resolve conflicts, delete dead code, fix tests, always malicious, fix CORS, SQLite

Author: Dev9269

.gitignore

@@ -1,11 +1,15 @@
-<<<<<<< HEAD
 # Python
 __pycache__/
 *.py[cod]
 *.egg-info/
+.pytest_cache/
 .venv/
 venv/
-# *.joblib  # committed for Render deployment
+*.log
+
+# Keep joblib/pkl committed (models/pe_detector.joblib is tracked)
+# *.joblib
+# *.pkl
 
 # Node
 node_modules/
@@ -23,17 +27,13 @@ Thumbs.db
 data/*.csv
 data/*.h5
 data/*.pkl
+data/*.db
+data/*.db-*
 data/ember*/
-=======
-__pycache__/
-*.pyc
-.pytest_cache/
-.venv/
-*.pkl
+data/samples/
+
+# Dotenv
 .env
+
+# Dead code model
 model/model.pkl
-data/samples/
-*.log
-data/*.db
-data/*.db-*
->>>>>>> d8f7c610f6fce2d625fc14812ad376c23cba466c