diff --git a/pars/tori_3d/sane.par b/pars/tori_3d/sane.par
index d014d7c2..57e291e2 100644
--- a/pars/tori_3d/sane.par
+++ b/pars/tori_3d/sane.par
@@ -20,21 +20,12 @@ nx2 = 64
 nx3 = 128
 
 <coordinates>
-<<<<<<< HEAD
 base = dcs_ks
 theory = dcs # valid strings - 'gr', 'dcs', 'edgb'
 zeta = 0.1
 transform = fmks
 r_out = 100
 a = 0.5
-=======
-base = spherical_ks
-# FMKS coordinates and transmitting polar bounds
-# are not compatible
-transform = mks
-r_out = 1000
-a = 0.9375
->>>>>>> upstream/feature/mod_gravity
 hslope = 0.3
 
 <parthenon/time>
@@ -107,7 +98,6 @@ dt = 100.0
 <parthenon/output2>
 file_type = hst
 dt = 0.1
-<<<<<<< HEAD
 
 # This outputs a geometry file, similar to iharm3d's old 'grid.h5'
 # Not needed for pyharm analysis in Kerr metrics, but useful in
@@ -121,5 +111,3 @@ single_precision_output = false
 variables = coords.Xnative, coords.Xsph, &
             coords.gcon, coords.gcov, coords.gdet, coords.lapse, &
             coords.conn
-=======
->>>>>>> upstream/feature/mod_gravity