diff --git a/.claude/settings.json b/.claude/settings.json
index 84659e6d..57f0b8b1 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -582,6 +582,7 @@
       "mcp__plugin_playwright_playwright__browser_fill_form",
       "mcp__plugin_playwright_playwright__browser_click",
       "Bash(GITEA_TOKEN=\"e6c9fecb1f0148939493ae0fa30407d28c91279d\" curl -s \"http://192.168.0.110:3001/api/v1/repos/wooo/awoooi/actions/runs?limit=5\" -H \"Authorization: token $GITEA_TOKEN\")",
+<<<<<<< Updated upstream
       "Bash(/Users/ogt/.pyenv/versions/3.11.7/bin/python3 /tmp/a4_smoke.py)",
       "Bash(/Users/ogt/.pyenv/versions/3.11.7/bin/python3 -c \"from src.repositories.aider_event_repository import AiderEventRepository; print\\('import OK'\\)\")",
       "Bash(/Users/ogt/.pyenv/versions/3.11.7/bin/python3 -m pytest tests/test_aider_event_service.py -v)",
@@ -741,6 +742,13 @@
       "WebFetch(domain:aicompetence.org)",
       "Bash(redis-cli -h 192.168.0.188 -p 6380 ping)",
       "Bash(redis-cli ping *)"
+=======
+      "Bash(/Users/ogt/.pyenv/versions/3.11.7/bin/python3 -m pytest apps/api/tests/test_aider_event_models.py -v)",
+      "Bash(/Users/ogt/.pyenv/versions/3.11.7/bin/python3 -m pytest tests/test_action_parsing.py -v --collect-only)",
+      "Bash(/Users/ogt/.pyenv/versions/3.11.7/bin/python3 -m pytest tests/test_action_parsing.py --collect-only)",
+      "Bash(/Users/ogt/.pyenv/versions/3.11.7/bin/python3 -m pytest tests/test_aider_event_models.py tests/test_secret_redactor.py -v)",
+      "Bash(/Users/ogt/.pyenv/versions/3.11.7/bin/python3 -c \"from src.repositories.aider_event_repository import AiderEventRepository; print\\('import OK'\\)\")"
+>>>>>>> Stashed changes
     ],
     "deny": [
       "Bash(rm -rf *)",
@@ -753,6 +761,7 @@
       "/Users/ogt/.claude/projects/-Users-ogt-awoooi/memory",
       "/Users/ogt/awoooi/.claude/hooks",
       "/Users/ogt/.claude/channels/telegram",
+<<<<<<< Updated upstream
       "/Users/ogt",
       "/Users/ogt/.claude",
       "/Users/ogt/awoooi/apps/web/src/app/[locale]/aiops"
@@ -815,6 +824,9 @@
           }
         ]
       }
+=======
+      "/Users/ogt/aider-watch"
+>>>>>>> Stashed changes
     ]
   }
 }