Added pytest pynput mark and addressed merge conflicts

Author: Tracy-Walker

tests/preferences/test_manage_cookie_data.py

@@ -1,3 +1,4 @@
+import pytest
 from selenium.webdriver import Firefox
 
 from modules.page_object import AboutPrefs
@@ -8,6 +9,7 @@
 COOKIE_SITE = "google.com"
 
 
+@pytest.mark.pynput
 def test_manage_cookie_data(driver: Firefox):
     """
     C143633 - Cookies and Site Data can be managed