diff --git a/niworkflows/interfaces/gradunwarp.py b/niworkflows/interfaces/gradunwarp.py
index 61652be208b..74e9b219ec4 100644
--- a/niworkflows/interfaces/gradunwarp.py
+++ b/niworkflows/interfaces/gradunwarp.py
@@ -29,6 +29,12 @@
     SimpleInterface
 )
 
+has_gradunwarp = False
+try:
+    import gradunwarp
+    has_gradunwarp = True
+except ImportError:
+    pass
 
 class _GradUnwarpInputSpec(TraitedSpec):
     infile = File(exists=True, mandatory=True, desc="input image to be corrected")
diff --git a/niworkflows/interfaces/tests/test_bids.py b/niworkflows/interfaces/tests/test_bids.py
index 007c943d60e..365a62356a8 100644
--- a/niworkflows/interfaces/tests/test_bids.py
+++ b/niworkflows/interfaces/tests/test_bids.py
@@ -300,11 +300,7 @@ def test_DerivativesDataSink_build_path(
         **entities,
     )
 
-<<<<<<< HEAD
     if isinstance(expectation, type):
-=======
-    if type(expectation) is type(Exception):
->>>>>>> 601d1d1f (fix flake8 tests)
         with pytest.raises(expectation):
             dds.run()
         return