diff --git a/site/docs/install/d945gclf.md b/site/docs/install/d945gclf.md
index 30e398f..4d95c7e 100644
--- a/site/docs/install/d945gclf.md
+++ b/site/docs/install/d945gclf.md
@@ -52,7 +52,6 @@ P*: Partially works with vendor firmware
 </div>
 If you just want flashing instructions, go to
 [../install/d945gclf.md](../install/d945gclf.md)
->>>>>>> 09844d62 (simplify docs/install and merge docs/hardware)
 
 D945GCLF2D also reported working by a user.
 
diff --git a/site/docs/install/index.md b/site/docs/install/index.md
index 8224a39..008db97 100644
--- a/site/docs/install/index.md
+++ b/site/docs/install/index.md
@@ -219,7 +219,6 @@ updating it will require external flashing.
 If you currently have the factory firmware, you probably need to flash
 externally; on *some* machines, internal flashing is possible, usually with
 special steps required that differ from updating an existing installation.
->>>>>>> 09844d62 (simplify docs/install and merge docs/hardware)
 
 The next sections will pertain to specific mainboards, where indicated,
 followed by general internal flashing instructions where applicable.