fix conflicts

Author: kobenguyent

docs/helpers/Nightmare.md

@@ -3,7 +3,7 @@ if none provided clears all cookies.
 
 ```js
 I.clearCookie();
-I.clearCookie('test'); // Playwright currently doesn't support clear a particular cookie name
+I.clearCookie('test');
 ```
 
 @param {?string} [cookie=null] (optional, `null` by default) cookie name

docs/helpers/Playwright.md

@@ -1980,10 +1980,11 @@ class Playwright extends Helper {
   /**
    * {{> clearCookie }}
    */
-  async clearCookie() {
-    // Playwright currently doesn't support to delete a certain cookie
-    // https://github.com/microsoft/playwright/blob/main/docs/src/api/class-browsercontext.md#async-method-browsercontextclearcookies
+  async clearCookie(cookieName) {
     if (!this.browserContext) return
+    if (cookieName) {
+      return this.browserContext.clearCookies({ name: cookieName })
+    }
     return this.browserContext.clearCookies()
   }
 

docs/helpers/Protractor.md

@@ -156,7 +156,7 @@
     "sinon": "19.0.2",
     "sinon-chai": "3.7.0",
     "testcafe": "3.7.1",
-    "ts-morph": "24.0.0",
+    "ts-morph": "25.0.0",
     "ts-node": "10.9.2",
     "tsd": "^0.31.0",
     "tsd-jsdoc": "2.5.0",