diff --git a/debian/changelog b/debian/changelog
index eafbbaaf..2e6f93b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 llvm-toolchain-12 (1:12.0.1-11) unstable; urgency=medium
 
-<<<<<<<
   * add missing LIBUNWIND_USE_COMPILER_RT to CLANG_BOOTSTRAP_PASSTHROUGH to link
     correct compiler-rt lib in stage2
   * consolidate two conditionals for libatomic that were essentially the same,
@@ -13,14 +12,10 @@ llvm-toolchain-12 (1:12.0.1-11) unstable; urgency=medium
   * reorganize flags and cmake options around stages for the toolchain build
   * set baseline arch to armv5t, remove older 3.8 workaround for armel build
   * update to debian host triple for the armhf build
+
   [ Jordan Justen ]
   * d/rules: Add amdgcn-mesa-mesa3d to libclc build.
     Closes: #993904, #995069
-=======
-  [ Jordan Justen ]
-  * d/rules: Add amdgcn-mesa-mesa3d to libclc build.
-    Closes: #993904, #995069
->>>>>>>
 
  -- Erik Maciejewski <mr.emacski@gmail.com>  Sat, 16 Oct 2021 09:07:25 -0700