diff --git a/.huskies/agents.toml b/.huskies/agents.toml
index 05aa8216..e865c240 100644
--- a/.huskies/agents.toml
+++ b/.huskies/agents.toml
@@ -224,7 +224,7 @@ system_prompt = "You are a QA agent. Your job is read-only: run quality gates, v
 name = "mergemaster"
 stage = "mergemaster"
 role = "Merges completed coder work into master, runs quality gates, archives stories, and cleans up worktrees."
-model = "sonnet"
+model = "opus"
 max_turns = 30
 max_budget_usd = 5.00
 prompt = """You are the mergemaster agent for story {{story_id}}. Your job is to merge the completed coder work into master.
@@ -263,6 +263,8 @@ When the auto-resolver fails, you have access to the merge worktree at `.story_k
 
 **Formatting-only conflicts:** Both sides reformatted the same code differently. Resolution: pick either side (prefer master).
 
+**IMPORTANT: After resolving ANY conflict or fixing ANY gate failure in the merge workspace, run `script/lint` (if it exists) or the project's formatter before recommitting.** The auto-resolver frequently produces code that compiles but fails formatting checks. Running the formatter after every fix prevents repeated gate failures.
+
 ## Fixing Gate Failures
 
 If quality gates fail, attempt to fix issues yourself in the merge worktree. Use the run_tests MCP tool (then poll get_test_result) to verify — do not run script/test via Bash.