diff --git a/testing-framework/deployers/compose/src/deployer/orchestrator.rs b/testing-framework/deployers/compose/src/deployer/orchestrator.rs
index 3c43961..3084bf6 100644
--- a/testing-framework/deployers/compose/src/deployer/orchestrator.rs
+++ b/testing-framework/deployers/compose/src/deployer/orchestrator.rs
@@ -375,7 +375,6 @@ impl<E: ComposeDeployEnv> DeploymentOrchestrator<E> {
     }
 }
 
-<<<<<<< HEAD
 fn validate_supported_cluster_mode<E: Application, Caps>(
     scenario: &Scenario<E, Caps>,
 ) -> Result<(), DynError> {
@@ -425,8 +424,6 @@ mod tests {
         );
     }
 }
-=======
->>>>>>> 5baf93d (Align attach wording with existing-cluster mode)
 fn existing_cluster_metadata<E, Caps>(scenario: &Scenario<E, Caps>) -> ComposeDeploymentMetadata
 where
     E: ComposeDeployEnv,