resolve conflicts

undetected_chromedriver/__init__.py

@@ -19,11 +19,7 @@ by UltrafunkAmsterdam (https://github.com/ultrafunkamsterdam)
 """
 
 
-<<<<<<< HEAD
-__version__ = "3.1.5r5"
-=======
 __version__ = "3.1.6"
->>>>>>> 2742ff582d3d104ed8708b0ad7922b2166d65a52
 
 
 import inspect
@@ -127,7 +123,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
         use_subprocess=True,
         debug=False,
         no_sandbox=True,
-        **kw
+        **kw,
     ):
         """
         Creates a new instance of the chrome driver.
@@ -675,11 +671,9 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
 
     def window_new(self):
         self.execute(
-           selenium.webdriver.remote.command.Command.NEW_WINDOW,
-              {"type": "window"}
+            selenium.webdriver.remote.command.Command.NEW_WINDOW, {"type": "window"}
         )
 
-         
     def tab_new(self, url: str):
         """
         this opens a url in a new tab.