Resolved merge conflicts

Signed-off-by: karthikaeyetea <karthika.subramani@candelatech.com>

tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py

@@ -111,5 +111,3 @@ class TestDynamicVlanOverSsid5GWpa3(object):
         elif not val:
             print("Station ip not assigned as per dynamic vlan")
             assert False
-
-

tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py

@@ -331,7 +331,11 @@ class TestDynamicVlan5GWpa3(object):
     @pytest.mark.wpa2_enterprise
     @pytest.mark.fiveg
     @allure.testcase(name="test_dynamic_unsupported_vlan",
+<<<<<<< HEAD
                      url="https://telecominfraproject.atlassian.net/browse/WIFI-6102")
+=======
+                     url="https://telecominfraproject.atlassian.net/browse/WIFI-5710")
+>>>>>>> Created testcases for WAP3_eap security
     def test_dynamic_unsupported_vlan(self, get_vif_state, lf_tools,
                                       create_lanforge_chamberview_dut, lf_test, get_configuration,
                                       station_names_fiveg):

tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py

@@ -15,7 +15,6 @@ from configuration import DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA
 pytestmark = [pytest.mark.ow_regression_lf,
               pytest.mark.ow_dvlan_tests_lf,
               pytest.mark.wpa3_enterprise,
-              pytest.mark.twog]
 
 setup_params_general = {
     "mode": "VLAN",
@@ -645,4 +644,3 @@ class TestDynamicVlan2GWpa3(object):
                 assert False
             lf_tools.admin_up_down([station_list[sta]], option="up")
             time.sleep(5)
-