# Conflicts: # .claude/hooks/block-risky-bash.sh # .claude/hooks/protect-files.sh # .claude/settings.json