diff --git a/binarycpython/tests/test_distributions.py b/binarycpython/tests/test_distributions.py
index 0d993122b23aadd403f8ce44854f576b276d4da6..ec9788947fdafb4bceddd330c46e1ef1c1f6c198 100644
--- a/binarycpython/tests/test_distributions.py
+++ b/binarycpython/tests/test_distributions.py
@@ -216,13 +216,13 @@ class TestDistributions(unittest.TestCase):
 
         # for m=0.5
         m = 0.5
+<<<<<<< HEAD
         self.assertLess(np.abs(imf_chabrier2003(m)-0.581457346702825), self.tolerance, msg="Difference is bigger than the tolerance")
 
         # For m = 2
         m = 2
         self.assertLess(np.abs(imf_chabrier2003(m)-0.581457346702825), self.tolerance, msg="Difference is bigger than the tolerance")
 
-
     def test_duquennoy1991(self):
         """
         Unittest for function duquennoy1991