diff --git a/gstlal-ugly/configure.ac b/gstlal-ugly/configure.ac
index e92a27ba4684ccf963f57d7c7db5234e42ddfd0a..5e62e586dd360c5397dc79f506b7269dc55b93a1 100644
--- a/gstlal-ugly/configure.ac
+++ b/gstlal-ugly/configure.ac
@@ -3,11 +3,7 @@
 #
 
 
-<<<<<<< Updated upstream
-AC_INIT([gstlal-ugly],[1.6.1],[gstlal-discuss@ligo.org],[gstlal-ugly])
-=======
 AC_INIT([gstlal-ugly],[1.6.5],[gstlal-discuss@ligo.org],[gstlal-ugly])
->>>>>>> Stashed changes
 AC_COPYRIGHT([Copyright (C) The authors (see source code for details)])
 # a file whose existance can be used to use to check that we are in the
 # top-level directory of the source tree
diff --git a/gstlal-ugly/debian/changelog b/gstlal-ugly/debian/changelog
index dccfeed60975e9676f8916d826e1a964feb605d9..6cf2a023f3ac9838411f9540e079ee730e1cf94a 100644
--- a/gstlal-ugly/debian/changelog
+++ b/gstlal-ugly/debian/changelog
@@ -1,5 +1,3 @@
-<<<<<<< Updated upstream
-=======
 gstlal-ugly (1.6.5-1) unstable; urgency=low
 
   * gstlal_ll_inspiral_aggregator: remove unneccesary Pool, change how kafka
@@ -33,7 +31,6 @@ gstlal-ugly (1.6.2-1) unstable; urgency=low
 
  -- Alexander Pace <alexander.pace@ligo.org> Sun, 17 Mar 2019 09:37:07 -0700
 
->>>>>>> Stashed changes
 gstlal-ugly (1.6.1-1) unstable; urgency=low
 
   * interpolator: fix bug where interpolator was pushing out nongap buffers