diff --git a/M2/Macaulay2/m2/varieties.m2 b/M2/Macaulay2/m2/varieties.m2
index cbba0d81de7..5c426480e38 100644
--- a/M2/Macaulay2/m2/varieties.m2
+++ b/M2/Macaulay2/m2/varieties.m2
@@ -516,15 +516,9 @@ Hom(CoherentSheaf, SheafOfRings)  :=
 Hom(CoherentSheaf, CoherentSheaf) := Module => (F, G) -> HH^0(variety F, sheafHom(F, G))
 
 sheafExt = new ScriptedFunctor from {
-<<<<<<< HEAD
     superscript => i -> new ScriptedFunctor from {
 	-- sheafExt^1(F, G)
 	argument => X -> applyMethod''(sheafExt, functorArgs(i, X))
-=======
-    superscript => i -> new Functor from {
-	-- sheafExt^i(F, G)
-	argument => X -> applyFunctor''(sheafExt, functorArgs(i, X))
->>>>>>> dc8097f373 (added more details for prune and Ext of sheaves)
 	},
     argument => X -> applyMethod''(sheafExt, X)
     }