diff --git a/tempest/config.py b/tempest/config.py
index c0207ea..b9101c6 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -490,8 +490,6 @@
                 help='Does the test environment support attaching a volume to '
                      'more than one instance? This depends on hypervisor and '
                      'volume backend/type and compute API version 2.60.'),
-<<<<<<< HEAD   (358b2d Do no check os-vol-host-attr:host in retype when using activ)
-=======
     cfg.BoolOpt('barbican_integration_enabled',
                 default=False,
                 help='Does the test environment support Barbican integration'),
@@ -500,7 +498,6 @@
                 help='Does the test environment support booting instances '
                      'from volume. This depends on hypervisor and volume '
                      'backend/type.'),
->>>>>>> CHANGE (9289d6 Update skip check for ServersTestBootFromVolume)
 ]