diff --git a/docs/docs/upgrading.md b/docs/docs/upgrading.md
index 30f9f150e..cae832319 100644
--- a/docs/docs/upgrading.md
+++ b/docs/docs/upgrading.md
@@ -38,7 +38,6 @@ In `0.9.0`:
 
 option httpchk GET /ping HTTP/1.1\r\nHost:pomerium
 ```
->>>>>>> c29807c3915b2e61d1a53dd007a8871b6494c3c6
 
 # Since 0.8.0