chore(backend,frontend,infra): resolve template update conflicts, mcp and impeccable files stay

backend/Makefile

@@ -1,15 +1,7 @@
 COMPOSE := cd .. && docker compose
-<<<<<<< before updating
-IMAGE := lodge/backend
 LINT := go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2
-changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null
-stamp = { git update-ref $(1) HEAD 2>/dev/null || true; }
 
-.PHONY: fmt check test build pre-deploy post-deploy client dev
-=======
-
-.PHONY: fmt check build
->>>>>>> after updating
+.PHONY: fmt check test build client dev
 
 fmt:
 	go mod tidy
@@ -24,20 +16,9 @@ test:
 
 build:
 	$(COMPOSE) build api
-<<<<<<< before updating
-
-pre-deploy:
-	@if $(call changed,refs/deploy/backend,.) || ! docker image inspect $(IMAGE) >/dev/null 2>&1; then \
-		$(MAKE) build && $(call stamp,refs/deploy/backend); \
-	fi
-
-post-deploy:
-	@:
 
 client:
 	go build -trimpath -ldflags "-s -w" -o bin/lodge ./cmd/lodge
 
 dev:
 	LODGE_DB=storage/lodge.db STATIC_DIR=../frontend/build CLIENTS_DIR=bin ADMIN_TOKEN=dev go run ./cmd/lodge-server
-=======
->>>>>>> after updating