diff --git a/codex-rs/core/src/exec_policy.rs b/codex-rs/core/src/exec_policy.rs
index 10349e53d1..aa0691f888 100644
--- a/codex-rs/core/src/exec_policy.rs
+++ b/codex-rs/core/src/exec_policy.rs
@@ -24,11 +24,6 @@ use codex_protocol::approvals::ExecPolicyAmendment;
 use codex_protocol::permissions::FileSystemSandboxKind;
 use codex_protocol::permissions::FileSystemSandboxPolicy;
 use codex_protocol::protocol::AskForApproval;
-<<<<<<< HEAD
-use codex_protocol::protocol::FileSystemSandboxKind;
-use codex_protocol::protocol::FileSystemSandboxPolicy;
-=======
->>>>>>> 8a34b897a (Drop permission policy changes from context fragment PR)
 use codex_protocol::protocol::SandboxPolicy;
 use thiserror::Error;
 use tokio::fs;
@@ -566,11 +561,7 @@ pub fn render_decision_for_unmatched_command(
                 Decision::Allow
             }
             FileSystemSandboxKind::Restricted => {
-<<<<<<< HEAD
-                if sandbox_permissions.requires_additional_permissions() {
-=======
                 if sandbox_permissions.requests_sandbox_override() {
->>>>>>> 8a34b897a (Drop permission policy changes from context fragment PR)
                     Decision::Prompt
                 } else {
                     Decision::Allow
diff --git a/codex-rs/core/src/tools/handlers/mod.rs b/codex-rs/core/src/tools/handlers/mod.rs
index 47759d74f0..7ae1d1428d 100644
--- a/codex-rs/core/src/tools/handlers/mod.rs
+++ b/codex-rs/core/src/tools/handlers/mod.rs
@@ -169,7 +169,7 @@ pub(super) fn implicit_granted_permissions(
     additional_permissions: Option<&PermissionProfile>,
     effective_additional_permissions: &EffectiveAdditionalPermissions,
 ) -> Option<PermissionProfile> {
-    if !sandbox_permissions.requires_additional_permissions()
+    if !sandbox_permissions.uses_additional_permissions()
         && !matches!(sandbox_permissions, SandboxPermissions::RequireEscalated)
         && additional_permissions.is_none()
     {