diff --git a/collects/scribblings/reference/contracts.scrbl b/collects/scribblings/reference/contracts.scrbl
index 06c3183706..c71b9c3cc2 100644
--- a/collects/scribblings/reference/contracts.scrbl
+++ b/collects/scribblings/reference/contracts.scrbl
@@ -2013,8 +2013,3 @@ makes a binary search tree contract, but one that is
   struct and returns a projection function that checks the contract.
   
 }
-<<<<<<< HEAD
-                              
-=======
-
->>>>>>> 0b337dc... rejiggered things to make sure all mzlib/contract exports are documented