diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 1273139..03929a4 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -24,6 +24,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MERGE_LABELS: "automerge"
-          MERGE_METHOD: "squash"
+          MERGE_METHOD: "merge"
           MERGE_DELETE_BRANCH: "true"
           UPDATE_METHOD: "rebase"
diff --git a/CLAUDE.md b/CLAUDE.md
index 8b21257..5bbb91a 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -114,8 +114,7 @@ pnpm db:studio        # Open Drizzle Studio (DB browser)
   ```bash
   gh pr create --title "..." --body "..." --label automerge
   ```
-- PRs with `automerge` label squash-merge and delete the branch automatically
-- Use squash merges to keep main history clean
+- PRs with `automerge` label merge and delete the branch automatically
 
 ### Stacking PRs (for fast local iteration)
 When working on sequential tasks, stack branches locally: