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

README.md

@@ -2,7 +2,6 @@
 
 A read-only Telegram client that keeps everything. A userbot on your own account logs every incoming message into Postgres, including the ones later deleted or edited, along with media, reactions, presence and stories. A web client reads that archive back, and an MCP server hands it to agents.
 
-<<<<<<< before updating
 Useful on its own: a Telegram where nothing disappears. In the [beaver](https://git.kotikot.com/beaver) setup it is one of the agent's hands - the dispatcher reads chat history by the `chat_id` stored in a person's card.
 
 ## What it keeps
@@ -32,7 +31,8 @@ Read-only: `list_watched_bots`, `get_bot_stats`, `get_bot_updates`, `search_mess
 ```sh
 make env                                  # .env and docker-compose.override.yml from the examples
 make -C backend session                   # log the account in once; the session file stays in backend/sessions
-make deploy                               # build what changed, migrate, start the containers
+make -C backend migrate                   # the schema
+make recreate                             # build and start the services in COMPOSE_PROFILES
 ```
 
 `COMPOSE_PROFILES` in `.env` selects what runs on the machine, `docker-compose.override.yml` in each part holds the published ports and the `caddy` network aliases. The web client and the MCP endpoint are served by `api`; the bearer for both is `AUTH__TOKEN`.
@@ -44,12 +44,3 @@ make fmt
 make check
 make -C frontend dev
 ```
-=======
-```sh
-make env       # .env and docker-compose.override.yml from the examples
-make recreate  # the services in COMPOSE_PROFILES
-make check
-```
-
-Parts: `backend/`, `frontend/`, each with its own Makefile.
->>>>>>> after updating