diff --git a/.env.example b/.env.example
index 3d0e309..d0df993 100644
--- a/.env.example
+++ b/.env.example
@@ -124,13 +124,8 @@ DEFAULT_MODEL=anthropic/claude-opus-4-6
 # Falls back to DEFAULT_MODEL if not set
 # EXTRACTION_MODEL=anthropic/claude-sonnet-4-5-20250929
 
-<<<<<<< HEAD
 # DEFAULT_MAX_ITERS=5
 # DEFAULT_MAX_LLM_CALLS=8
-=======
-# DEFAULT_MAX_ITERS=3
-# DEFAULT_MAX_LLM_CALLS=5
->>>>>>> main
 # Provider reasoning budget: minimal | low | medium | high
 # DEFAULT_REASONING_EFFORT=medium
 # DEFAULT_TEMPERATURE=0.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3374f9..3c31085 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 ## [Unreleased]
 
-<<<<<<< HEAD
+## [1.0.14] - 2026-08-31
+
+### Fixed
+- Resolved leftover merge conflict markers in `.env.example` and `CHANGELOG.md`
+
 ## [1.0.13] - 2026-08-31
 
 ### Changed
@@ -24,8 +28,6 @@
 - `max_llm_calls` now propagated to code reviewer, scope resolver, and supply chain auditor RLM agents
 - GitHub Action: `default-max-tokens` input, `summary-max-iters` input, full `audit-*` signature inputs (`audit-enabled`, `audit-model`, `audit-max-iters`, `audit-max-llm-calls`, `audit-reasoning-effort`, `audit-temperature`), `audit-memory-enabled` input
 
-=======
->>>>>>> main
 ## [1.0.12] - 2026-08-30
 
 ### Changed
diff --git a/pyproject.toml b/pyproject.toml
index 9a51583..086f2f4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codespy-ai"
-version = "1.0.13"
+version = "1.0.14"
 description = "Code review agent powered by DSPy"
 readme = "README.md"
 license = "MIT"
diff --git a/src/codespy/__init__.py b/src/codespy/__init__.py
index 3412ec0..e32980e 100644
--- a/src/codespy/__init__.py
+++ b/src/codespy/__init__.py
@@ -1,3 +1,3 @@
 """codespy - Code review agent powered by DSPy."""
 
-__version__ = "1.0.13"
+__version__ = "1.0.14"