diff --git a/tests/conftest.py b/tests/conftest.py
index 40276ff1f2db47c06e3c1c6892f984fc8230cdb3..7b4fe9e5cc2f949b738926086d8415e08fb56708 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -160,19 +160,9 @@ class DatabaseCheckers:
 
         Parameters
         ----------
-<<<<<<< HEAD
         split
             An instance of DatabaseSplit.
         lengths
-=======
-
-        make_split
-            A database specific function that takes a split name and returns
-            the loaded database split.
-        split_filename
-            This is the split we will check.
-        lenghts
->>>>>>> 91bcad6 ([test] Add checks for specific image shapes)
             A dictionary that contains keys matching those of the split (this will
             be checked).  The values of the dictionary should correspond to the
             sizes of each of the datasets in the split.
@@ -236,7 +226,6 @@ class DatabaseCheckers:
         assert isinstance(batch[0], torch.Tensor)
         assert batch[0].shape[0] == batch_size  # mini-batch size
         assert batch[0].shape[1] == color_planes
-        assert batch[0].shape[2] == batch[0].shape[3]  # image is square
 
         if expected_image_shape:
             assert all(