diff --git a/src/asteroid_sdk/registration/helper.py b/src/asteroid_sdk/registration/helper.py
index cd5adfc..d2b7eb7 100644
--- a/src/asteroid_sdk/registration/helper.py
+++ b/src/asteroid_sdk/registration/helper.py
@@ -641,7 +641,6 @@ def wait_for_human_decision(supervision_request_id: UUID, timeout: int = 86400)
 def get_human_supervision_decision_api(
     supervision_request_id: UUID,
     timeout: int = 86400) -> SupervisionDecision:
->>>>>>> 137ce1c (fix: increase timeout for human supervision to 24 hours)
     """Get the supervision decision from the backend API."""
 
     client = APIClientFactory.get_client()