resolved merge conflicts

Author: sandeepsuryaprasad

py/conftest.py

@@ -304,6 +304,10 @@ def driver(request):
     if not selenium_driver.is_platform_valid:
         pytest.skip(f"{driver_class} tests can only run on {selenium_driver.exe_platform}")
 
+    # skip tests in the 'remote' directory if run with a local driver
+    if request.node.path.parts[-2] == "remote" and selenium_driver.driver_class != "Remote":
+        pytest.skip(f"Remote tests can't be run with driver '{selenium_driver.driver_class}'")
+
     # skip tests for drivers that don't support BiDi when --bidi is enabled
     if selenium_driver.bidi:
         if driver_class.lower() not in selenium_driver.supported_bidi_drivers: