diff --git a/dotfiles/claude/CLAUDE.md b/dotfiles/claude/CLAUDE.md
index d534f44..0ecf02d 100644
--- a/dotfiles/claude/CLAUDE.md
+++ b/dotfiles/claude/CLAUDE.md
@@ -4,7 +4,7 @@
 
 When implementing features or fixing bugs, follow the strict TDD practices defined in:
 
-@~/.claude/custom-snippets/strict-tdd-guide.md
+~/.claude/custom-snippets/strict-tdd-guide.md
 
 ## Descriptive variables
 Always use human-readable, descriptive variables.
diff --git a/dotfiles/claude/skills/lookup-docs/SKILL.md b/dotfiles/claude/skills/lookup-docs/SKILL.md
new file mode 100644
index 0000000..c7cf788
--- /dev/null
+++ b/dotfiles/claude/skills/lookup-docs/SKILL.md
@@ -0,0 +1,34 @@
+---
+name: lookup-docs
+description: Load reference documentation from ~/.claude/context/reference-docs/ before answering questions. Use when user asks to consult specific docs (e.g., argo-cd, kubernetes).
+---
+
+# Reference Documentation Lookup
+
+You have been instructed to consult reference documentation before answering the user's question.
+
+## Workflow
+
+1. **Identify the documentation topic** from the user's request (e.g., "argo-cd", "kubernetes")
+
+2. **Search local reference docs** at `~/.claude/context/reference-docs/<topic>/`
+   - Use Grep to find files containing keywords from the user's question
+   - Prioritize files whose names suggest relevance
+
+3. **Load relevant documentation**
+   - Read the 1-4 most relevant files
+   - If the docs are large, use targeted searches within them
+
+4. **If not found locally**
+   - Report that the docs aren't available in `~/.claude/context/reference-docs/`
+   - Ask if the user wants you to: proceed without the docs, lookup docs online, wait for the user to add the docs to the reference folder, or some other approach
+
+5. **Answer the original question**
+   - Synthesize information from the loaded docs
+   - Cite specific sections/files when possible
+   - If docs don't fully answer the question, note what's missing
+
+## Important
+- This skill loads docs into context, then you continue the conversation
+- Don't just summarize docs - answer the specific question asked
+- Reference file paths when citing information
diff --git a/scripts/claude.sh b/scripts/claude.sh
index f83b6ee..e133ce3 100755
--- a/scripts/claude.sh
+++ b/scripts/claude.sh
@@ -104,8 +104,6 @@ symlink_preferences() {
     done
 }
 
-<<<<<<< HEAD
-=======
 symlink_skills() {
     local dotfiles_claude_dir="$1"
     local source_skills_dir="$dotfiles_claude_dir/skills"
@@ -125,8 +123,11 @@ symlink_skills() {
         create_symlink_if_needed "$skill_item" "$target_skills_dir/$item_name"
     done
 }
+<<<<<<< HEAD
 
 >>>>>>> 2bc28bb6d1d387013755edb33725a17d06a9ee42
+=======
+>>>>>>> fbcc70b (Add a lookup-docs skill)
 main() {
     ensure_claude_directory_initialized
 
@@ -143,10 +144,7 @@ main() {
     symlink_custom_snippets "$dotfiles_claude_dir"
     symlink_claude_md "$dotfiles_claude_dir"
     symlink_preferences "$dotfiles_claude_dir"
-<<<<<<< HEAD
-=======
     symlink_skills "$dotfiles_claude_dir"
->>>>>>> 2bc28bb6d1d387013755edb33725a17d06a9ee42
 
     echo "Done!"
 }