diff --git a/docs/language/dartLangSpec.tex b/docs/language/dartLangSpec.tex
index d48dbdce624..f06888f7908 100644
--- a/docs/language/dartLangSpec.tex
+++ b/docs/language/dartLangSpec.tex
@@ -47,7 +47,6 @@
 %   local function evaluates to the closurization of that declaration.
 % - Make `mixin` and `interface` built-in identifiers.
 % - Make `async` *not* a reserved word inside async functions.
-<<<<<<< HEAD
 % - Add 'Class Member Conflicts', simplifying and adjusting rules about
 %   member declaration conflicts beyond "`n` declared twice in one scope".
 % - Specify that integer literals are limited to signed 64-bit values,
@@ -56,9 +55,7 @@
 % - Specify variance and super-bounded types.
 % - Introduce `subterm` and `immediate subterm`.
 % - Introduce `top type`.
-=======
 % - Specify configurable imports.
->>>>>>> Update changelog.
 %
 % 1.15
 % - Change how language specification describes control flow.