diff --git a/src/exoplanet/orbits/dur_to_ecc.py b/src/exoplanet/orbits/dur_to_ecc.py
index 09462239..30db9ce1 100644
--- a/src/exoplanet/orbits/dur_to_ecc.py
+++ b/src/exoplanet/orbits/dur_to_ecc.py
@@ -37,13 +37,7 @@ def duration_to_eccentricity(
     s = pt.sin(kwargs["omega"])
     umax_inv = pt.switch(pt.lt(s, 0), pt.sqrt(1 - s**2), 1.0)
 
-<<<<<<< HEAD
-    const = period * tt.shape_padright(r_star) * tt.sqrt((1 + ror) ** 2 - b**2)
-=======
-    const = (
-        period * pt.shape_padright(r_star) * pt.sqrt((1 + ror) ** 2 - b**2)
-    )
->>>>>>> 2f34493e4896c67ba726ae7550dd70173534c158
+    const = period * pt.shape_padright(r_star) * pt.sqrt((1 + ror) ** 2 - b**2)
     const /= np.pi * a
 
     u = duration / const