diff --git a/tests/preprocessing_test.py b/tests/preprocessing_test.py
index 10632e2..78f72d6 100644
--- a/tests/preprocessing_test.py
+++ b/tests/preprocessing_test.py
@@ -7,24 +7,18 @@ from os import remove
 
 
 def test_dataset_request():
-<<<<<<< HEAD
-=======
     """
     Checks that the datasets URLs are reachable
     """
->>>>>>> coolneng
     for dataset in DATASETS:
         response = get(URL.format(dataset))
         assert response.status_code == 200
 
 
 def test_dataframe_creation():
-<<<<<<< HEAD
-=======
     """
     Verifes that the DataFrames are created and filtered properly
     """
->>>>>>> coolneng
     for dataset in DATASETS:
         request_dataset(dataset)
         df = create_dataframe(dataset)