PR #2 merged before the Dockerfile cleanup landed, leaving <<<<<<< markers that break docker compose build. Restore clean Docker files and fail CI if conflict markers appear in the tree.
