diff --git a/classical/contra.v b/classical/contra.v
index 8f83402395..5ac489d2ea 100644
--- a/classical/contra.v
+++ b/classical/contra.v
@@ -845,7 +845,6 @@ Canonical and_wProp.
 Canonical or_wProp.
 Canonical exists_wProp.
 Canonical exists2_wProp.
->>>>>>> fe374f6c (patch contra.v)
 
 (******************************************************************************)
 (* Lemma and tactic assume_not: add a goal negation assumption. The tactic    *)