diff --git a/tests/test_ultranest.py b/tests/test_ultranest.py
index 9afe01d..db323bd 100644
--- a/tests/test_ultranest.py
+++ b/tests/test_ultranest.py
@@ -1,10 +1,13 @@
 import pytest
 
 import numpy as np
+
 <<<<<<< HEAD
 from py21cmfast._utils import ParameterError
+
 =======
 from py21cmfast.utils import ParameterError
+
 >>>>>>> 8f37db0abbf256c3f878abf980a2e7f171bfd3e6
 
 import py21cmmc as mcmc