Changes to be committed:

	modified:   main.py

main.py

@@ -1,11 +1,8 @@
-<<<<<<< HEAD
 ##### IMPORT
-=======
-##### IMPORT 
 import pytest
 import logging as log
 import time
-from selenium import webdriver 
+from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
@@ -13,7 +10,6 @@ from selenium.common.exceptions import TimeoutException
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.firefox.options import Options
->>>>>>> 0b712e16e7065a3f6d3ef5a8c7ef412d1214562a
 
 
 ##### MANEL