diff --git a/libs/tip_2x/tip_2x.py b/libs/tip_2x/tip_2x.py
index 07f1bcd1f..63cd5a2a6 100644
--- a/libs/tip_2x/tip_2x.py
+++ b/libs/tip_2x/tip_2x.py
@@ -1148,4 +1148,4 @@ if __name__ == '__main__':
     d = var.setup_basic_configuration(configuration=setup_params_enterprise, requested_combination=target)
     print(d)
     # var.setup_firmware()
-    # var.teardown_objects()
+    # var.teardown_objects()
\ No newline at end of file
diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py
index c90f87df5..4e66e1930 100644
--- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py
+++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py
@@ -404,4 +404,4 @@ class TestBridgeModeConnectivitySuiteTwo(object):
                                                                    passkey=security_key, mode=mode, band=band,
                                                                    num_sta=num_stations)
 
-        assert passes == "PASS", result
\ No newline at end of file
+        assert passes == "PASS", result
diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py
index 16738a166..22fb5501e 100644
--- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py
+++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py
@@ -29,13 +29,13 @@ setup_params_general = {
 @allure.parent_suite("Client Connectivity Tests")
 @allure.suite(suite_name="NAT Mode")
 @allure.sub_suite(sub_suite_name="General security mode Client Connectivity")
-@pytest.mark.parametrize(
-    'setup_configuration',
-    [setup_params_general],
-    indirect=True,
-    scope="class"
-)
-@pytest.mark.usefixtures("setup_configuration")
+# @pytest.mark.parametrize(
+#     'setup_configuration',
+#     [setup_params_general],
+#     indirect=True,
+#     scope="class"
+# )
+# @pytest.mark.usefixtures("setup_configuration")
 class TestNatModeConnectivitySuiteA(object):
     """
         NAT Client Connectivity (open. wpa. wpa2_personal) (twog, fiveg)
@@ -48,9 +48,13 @@ class TestNatModeConnectivitySuiteA(object):
     @pytest.mark.parametrize('execution_number', range(2))
     @allure.title("NAT Mode Client Connectivity Test with open encryption 2.4 GHz Band")
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2809", name="JIRA LINK")
+<<<<<<< HEAD
     def test_nat_open_2g_client_connectivity(self, get_test_library, execution_number, num_stations,
                                              get_dut_logs_per_test_case, get_test_device_logs,
                                              check_connectivity, setup_configuration):
+=======
+    def test_nat_open_2g_client_connectivity(self, get_test_library, execution_number, num_stations):
+>>>>>>> fixed the logic for client_connectivity tests nat-lan mode
         """
             NAT Mode Client Connectivity Test with open encryption 2.4 GHz Band
             pytest -m "client_connectivity_tests and nat and general and open and twog"
@@ -64,8 +68,10 @@ class TestNatModeConnectivitySuiteA(object):
         if execution_number == 1:
             mode = "NAT-LAN"
         band = "twog"
+        dut = {'0000c1018812': [['ssid_open_2g_nat', 'open', 'something', '2G', '6A:21:5F:DA:45:6F'],
+                                {'2G': [6, 40, 2437], '5G': None, '6G': None}]}
         passes, result = get_test_library.client_connectivity_test(ssid=ssid_name, security=security,
-                                                                   dut_data=setup_configuration,
+                                                                   dut_data=dut,
                                                                    passkey=security_key, mode=mode, band=band,
                                                                    num_sta=num_stations)
 
diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py
index 617354148..1fc7892f4 100644
--- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py
+++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py
@@ -444,4 +444,4 @@ class TestVLANModeConnectivitySuiteTwo(object):
                                                                    passkey=security_key, mode=mode, band=band,
                                                                    num_sta=num_stations, vlan_id=vlan)
 
-        assert passes == "PASS", result
\ No newline at end of file
+        assert passes == "PASS", result
diff --git a/tests/lab_info.json b/tests/lab_info.json
index 242f800bc..0cdde160d 100644
--- a/tests/lab_info.json
+++ b/tests/lab_info.json
@@ -330,4 +330,4 @@
   },
   "open_flow": {},
   "influx_params": {}
-}
+}
\ No newline at end of file