diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py
index a20103b7b..41bcb3c4f 100644
--- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py
+++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py
@@ -111,4 +111,3 @@ class TestDynamicVlanOverSsid5GWpa3(object):
         elif not val:
             print("Station ip not assigned as per dynamic vlan")
             assert False
-
diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py
index 05dcaea05..85ec494ff 100644
--- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py
+++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py
@@ -647,4 +647,3 @@ class TestDynamicVlan5GWpa3(object):
                 assert False
             lf_tools.admin_up_down([station_list[sta]], option="up")
             time.sleep(5)
-
diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py
index 7c4be499f..b138a4ffa 100644
--- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py
+++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py
@@ -111,4 +111,3 @@ class TestDynamicVlanOverSsid2GWpa3(object):
         elif not val:
             print("Station ip not assigned as per dynamic vlan")
             assert False
-
diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py
index 12733016b..ee5b9b7aa 100644
--- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py
+++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py
@@ -46,7 +46,11 @@ class TestDynamicVlan2GWpa3(object):
     @pytest.mark.wpa3_enterprise
     @pytest.mark.twog
     @allure.testcase(name="test_ssid_vlan_in_the_absence_of_radius_vlan_identifier",
+<<<<<<< HEAD
                      url="https://telecominfraproject.atlassian.net/browse/WIFI-6095")
+=======
+                     url="https://telecominfraproject.atlassian.net/browse/WIFI-5704")
+>>>>>>> Changed class and function names
     def test_ssid_vlan_in_the_absence_of_radius_vlan_identifier_2g_wpa3(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs,
                                                                 create_lanforge_chamberview_dut, lf_test,
                                                                 get_configuration,
@@ -114,7 +118,11 @@ class TestDynamicVlan2GWpa3(object):
     @pytest.mark.wpa3_enterprise
     @pytest.mark.twog
     @allure.testcase(name="test_dynamic_invalid_vlan",
+<<<<<<< HEAD
                      url="https://telecominfraproject.atlassian.net/browse/WIFI-6097")
+=======
+                     url="https://telecominfraproject.atlassian.net/browse/WIFI-5706")
+>>>>>>> Changed class and function names
     def test_dynamic_invalid_vlan_2g_wpa3(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs,
                                   create_lanforge_chamberview_dut, lf_test, get_configuration,
                                   station_names_twog):
@@ -179,7 +187,11 @@ class TestDynamicVlan2GWpa3(object):
     @pytest.mark.wpa3_enterprise
     @pytest.mark.twog
     @allure.testcase(name="test_radius_vlan_info_retained_after_periodic_reauthentication",
+<<<<<<< HEAD
                      url="https://telecominfraproject.atlassian.net/browse/WIFI-6098")
+=======
+                     url="https://telecominfraproject.atlassian.net/browse/WIFI-5707")
+>>>>>>> Changed class and function names
     def test_radius_vlan_info_retained_after_periodic_reauthentication_2g_wpa3(self, get_vif_state, lf_tools, get_lf_logs,
                                                                        get_ap_logs,
                                                                        create_lanforge_chamberview_dut, lf_test,
@@ -263,7 +275,11 @@ class TestDynamicVlan2GWpa3(object):
     @pytest.mark.wpa3_enterprise
     @pytest.mark.twog
     @allure.testcase(name="test_ssid_vlan_used_in_absence_of_radius_vlan",
+<<<<<<< HEAD
                      url="https://telecominfraproject.atlassian.net/browse/WIFI-6100")
+=======
+                     url="https://telecominfraproject.atlassian.net/browse/WIFI-5708")
+>>>>>>> Changed class and function names
     def test_ssid_vlan_used_in_absence_of_radius_vlan_2g_wpa3(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs,
                                                       create_lanforge_chamberview_dut, lf_test, get_configuration,
                                                       station_names_twog):
@@ -384,7 +400,11 @@ class TestDynamicVlan2GWpa3(object):
     @pytest.mark.wpa3_enterprise
     @pytest.mark.twog
     @allure.testcase(name="test_outof_bound_vlanid",
+<<<<<<< HEAD
                      url="https://telecominfraproject.atlassian.net/browse/WIFI-6103")
+=======
+                     url="https://telecominfraproject.atlassian.net/browse/WIFI-5711")
+>>>>>>> Changed class and function names
     def test_out_of_bound_vlanid_2g_wpa3(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs,
                                 create_lanforge_chamberview_dut, lf_test, get_configuration,
                                 station_names_twog):
@@ -430,7 +450,11 @@ class TestDynamicVlan2GWpa3(object):
     @pytest.mark.wpa3_enterprise
     @pytest.mark.twog
     @allure.testcase(name="test_client_association_ap_with_dynamic_vlan",
+<<<<<<< HEAD
                      url="https://telecominfraproject.atlassian.net/browse/WIFI-6104")
+=======
+                     url="https://telecominfraproject.atlassian.net/browse/WIFI-5712")
+>>>>>>> Changed class and function names
     def test_client_association_ap_with_dynamic_vlan_2g_wpa3(self, get_vif_state, lf_tools, get_ap_logs, get_lf_logs,
                                                      create_lanforge_chamberview_dut, lf_test, get_configuration,
                                                      station_names_twog):
@@ -500,7 +524,11 @@ class TestDynamicVlan2GWpa3(object):
     @pytest.mark.wpa3_enterprise
     @pytest.mark.twog
     @allure.testcase(name="test_subsequent_user_for_same_user_account",
+<<<<<<< HEAD
                      url="https://telecominfraproject.atlassian.net/browse/WIFI-6105")
+=======
+                     url="https://telecominfraproject.atlassian.net/browse/WIFI-5713")
+>>>>>>> Changed class and function names
     def test_subsequent_user_for_same_user_account_2g_wpa3(self, get_vif_state, lf_tools, get_lf_logs,
                                                         get_ap_logs,
                                                         create_lanforge_chamberview_dut, lf_test,
@@ -575,7 +603,11 @@ class TestDynamicVlan2GWpa3(object):
     @pytest.mark.wpa3_enterprise
     @pytest.mark.twog
     @allure.testcase(name="test_subsequent_user_for_different_user_account_vlan",
+<<<<<<< HEAD
                      url="https://telecominfraproject.atlassian.net/browse/WIFI-6106")
+=======
+                     url="https://telecominfraproject.atlassian.net/browse/WIFI-5714")
+>>>>>>> Changed class and function names
     def test_subsequent_user_for_different_user_account_2g_wpa3(self, get_vif_state, lf_tools, get_lf_logs,
                                                         get_ap_logs,
                                                         create_lanforge_chamberview_dut, lf_test,