diff --git a/tests/test_utils.py b/tests/test_utils.py
index d168bbc..68fc955 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -33,15 +33,8 @@ def test_find_nearest():
     a = np.linspace(0,99,100)
     assert find_nearest(a,10.1) == 10
 
-<<<<<<< HEAD
-# TODO: repair with newer xraydb 4.5.0 when available in conda-forge
-# def test_xray_transmission():
-#    T = xray_transmission(9000, 100e-6, material = 'Si')
-#    assert T == 0.342385039732607
-
-=======
 def test_xray_transmission():
     T = xray_transmission(9000, 100e-6, material = 'Si')
     assert T == 0.342385039732607
->>>>>>> fd8f63b (fixed for lmfit 1.2)
+