diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py
index d5da23922..2558ab886 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py
@@ -88,4 +88,4 @@ class TestDataplaneThroughputBRIDGE(object):
                                                    instance_name="TIP_DPT_DPT_WPA2_5G_BRIDGE",
                                                    influx_tags=influx_tags, move_to_influx=False,
                                                    dut_data=setup_configuration
-                                                   )
+                                                   )
\ No newline at end of file
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py
index 70ba87909..48784d1d0 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py
@@ -88,4 +88,4 @@ class TestDataplaneThroughputNAT(object):
                                                    instance_name="TIP_DPT_DPT_WPA2_5G_NAT",
                                                    influx_tags=influx_tags, move_to_influx=False,
                                                    dut_data=setup_configuration
-                                                   )
+                                                   )
\ No newline at end of file
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py
index 13436ae10..7354f27d5 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py
@@ -37,11 +37,7 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestDataplaneThroughputBRIDGE(object):
     """Dataplane THroughput BRIDGE Mode
-<<<<<<< HEAD
        pytest -m "dataplane_tests and wpa3_personal and bridge"
-=======
-       pytest -m "dataplane_throughput_test and wpa3_personal and bridge"
->>>>>>> Changed marker expression in description
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
@@ -79,11 +75,7 @@ class TestDataplaneThroughputBRIDGE(object):
                                                   get_target_object,
                                                   num_stations, setup_configuration):
         """Dataplane THroughput BRIDGE Mode
-<<<<<<< HEAD
            pytest -m "dataplane_tests and bridge and wpa3_personal and fiveg"
-=======
-           pytest -m "dataplane_throughput_test and bridge and wpa3_personal and fiveg"
->>>>>>> Changed marker expression in description
         """
         profile_data = {"ssid_name": "wpa3_personal_dataplane_5g", "appliedRadios": ["5G"], "security_key": "something"}
         ssid_name = profile_data["ssid_name"]
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py
index 87dc2629c..562731c06 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py
@@ -38,11 +38,7 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestDataplaneThroughputVLAN(object):
     """Dataplane THroughput VLAN Mode
-<<<<<<< HEAD
        pytest -m "dataplane_tests and wpa3_personal and vlan"
-=======
-       pytest -m "dataplane_throughput_test and wpa3_personal and vlan"
->>>>>>> Changed marker expression in description
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
@@ -54,11 +50,7 @@ class TestDataplaneThroughputVLAN(object):
                                                 get_target_object,
                                                 num_stations, setup_configuration):
         """Dataplane THroughput VLAN Mode
-<<<<<<< HEAD
            pytest -m "dataplane_tests and vlan and wpa3_personal and twog"
-=======
-           pytest -m "dataplane_throughput_test and vlan and wpa3_personal and twog"
->>>>>>> Changed marker expression in description
         """
         profile_data = {"ssid_name": "wpa3_personal_dataplane_2g", "appliedRadios": ["2G"], "security_key": "something",
                         "vlan": 100}
@@ -86,11 +78,7 @@ class TestDataplaneThroughputVLAN(object):
                                                 get_target_object,
                                                 num_stations, setup_configuration):
         """Dataplane THroughput VLAN Mode
-<<<<<<< HEAD
            pytest -m "dataplane_tests and vlan and wpa3_personal and fiveg"
-=======
-           pytest -m "dataplane_throughput_test and vlan and wpa3_personal and fiveg"
->>>>>>> Changed marker expression in description
         """
         profile_data = {"ssid_name": "wpa3_personal_dataplane_5g", "appliedRadios": ["2G"], "security_key": "something",
                         "vlan": 100}