- Add mergeRetries counter to track per-task retry attempts - Auto-resolve lock files and generated files during retry attempts - Clean up worktree when all 3 merge retry attempts are exhausted - Add comprehensive tests for retry cleanup logic in executor - Add changeset for the worktree retry cleanup fix