Resolve Makefile merge conflicts and upgrade dependencies

Remove agent-rules generation targets and resolve copier update conflicts.
Run uv sync --upgrade to update all dependencies.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: jlevy

Makefile

@@ -4,15 +4,9 @@
 
 .DEFAULT_GOAL := default
 
-<<<<<<< before updating
-.PHONY: default install lint test upgrade build clean agent-rules format-docs
+.PHONY: default install lint test upgrade build clean format-docs
 
-default: agent-rules format-docs install lint test 
-=======
-.PHONY: default install lint test upgrade build clean
-
-default: install lint test 
->>>>>>> after updating
+default: format-docs install lint test
 
 install:
 	uv sync --all-extras
@@ -29,22 +23,6 @@ upgrade:
 build:
 	uv build
 
-<<<<<<< before updating
-agent-rules: CLAUDE.md GEMINI.md AGENTS.md
-
-# Use .cursor/rules for sources of rules.
-# Create Claude and Codex rules from these.
-CLAUDE.md: .cursor/rules/general.mdc .cursor/rules/python.mdc
-	cat .cursor/rules/general.mdc .cursor/rules/python.mdc .cursor/rules/flowmark.mdc > CLAUDE.md
-
-GEMINI.md: .cursor/rules/general.mdc .cursor/rules/python.mdc
-	cat .cursor/rules/general.mdc .cursor/rules/python.mdc .cursor/rules/flowmark.mdc > GEMINI.md
-
-AGENTS.md: .cursor/rules/general.mdc .cursor/rules/python.mdc
-	cat .cursor/rules/general.mdc .cursor/rules/python.mdc .cursor/rules/flowmark.mdc > AGENTS.md
-
-=======
->>>>>>> after updating
 clean:
 	-rm -rf dist/
 	-rm -rf *.egg-info/