diff --git a/python/tskit/trees.py b/python/tskit/trees.py
index 74473c88cc..730b3917c4 100644
--- a/python/tskit/trees.py
+++ b/python/tskit/trees.py
@@ -7665,10 +7665,6 @@ def parse_time_windows(self, time_windows):
             time_windows = [0.0, math.inf]
         return np.array(time_windows)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> d31f13b4 (AFS branch mode with time windows to review)
     def __run_windowed_stat(self, windows, method, *args, **kwargs):
         strip_win = windows is None
         windows = self.parse_windows(windows)
@@ -7679,12 +7675,6 @@ def __run_windowed_stat(self, windows, method, *args, **kwargs):
 
     # only for temporary tw version
     def __run_windowed_stat_tw(self, windows, time_windows, method, *args, **kwargs):
-<<<<<<< HEAD
-=======
-    def __run_windowed_stat(self, windows, time_windows, method, *args, **kwargs):
->>>>>>> 14e1cefc (Better dimension drop with time windows)
-=======
->>>>>>> d31f13b4 (AFS branch mode with time windows to review)
         strip_win = windows is None
         strip_timewin = time_windows is None
         windows = self.parse_windows(windows)
@@ -8658,7 +8648,6 @@ def genetic_relatedness_weighted(
             centre=centre,
         )
 
-<<<<<<< HEAD
     def genetic_relatedness_vector(
         self,
         W,
@@ -8722,8 +8711,6 @@ def genetic_relatedness_vector(
         )
         return out
 
-=======
->>>>>>> d31f13b4 (AFS branch mode with time windows to review)
     def trait_covariance(self, W, windows=None, mode="site", span_normalise=True):
         """
         Computes the mean squared covariances between each of the columns of ``W``
@@ -8872,16 +8859,7 @@ def trait_regression(self, *args, **kwargs):
         return self.trait_linear_model(*args, **kwargs)
 
     def trait_linear_model(
-<<<<<<< HEAD
         self, W, Z=None, windows=None, mode="site", span_normalise=True
-=======
-        self,
-        W,
-        Z=None,
-        windows=None,
-        mode="site",
-        span_normalise=True,
->>>>>>> d31f13b4 (AFS branch mode with time windows to review)
     ):
         """
         Finds the relationship between trait and genotype after accounting for