chore(backend,infra): resolve template update conflicts, import check knows the watcher and the api login

backend/src/utils/env.py

@@ -4,27 +4,7 @@ from pydantic import Field, SecretStr
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
-<<<<<<< before updating
 class DatabaseSettings(BaseSettings):
-=======
-def is_prod() -> bool:
-    return os.getenv("RUN_ENVIRONMENT") == "prod"
-
-
-class Section(BaseSettings):
-    model_config = SettingsConfigDict(extra="ignore")
-
-
-class LogSettings(Section):
-    level: str = "INFO"
-    level_external: str = "WARNING"
-    show_time: bool = False
-    show_locals: bool = False
-    console_width: int = 150
-
-
-class DatabaseSettings(Section):
->>>>>>> after updating
     host: str = "postgres"
     port: int = 5432
     user: str = "beavergram"
@@ -76,6 +56,7 @@ class LogSettings(BaseSettings):
     level: str = "INFO"
     level_external: str = "WARNING"
     show_time: bool = False
+    show_locals: bool = False
     console_width: int = 150