--- a/model/prov-constraints.html	Sun Apr 29 14:12:52 2012 +0100
+++ b/model/prov-constraints.html	Sun Apr 29 14:14:12 2012 +0100
@@ -281,28 +281,6 @@
  href="#collection-constraints" class="sectionRef"></a> and <a
  href="#account-constraints" class="sectionRef"></a>).  </p>
 
-<<<<<<< local
-<!--
-<div class="note">Question to James: The term 'PROV Instance' seems to have a precise meaning. I read this as a PROV Description Set. Should we define it? Every where it occurs, there is a link to its first occurrence.</div>
--->
-=======
->>>>>>> other
-
-<<<<<<< local
-<p>
-The specification also describes how the inferences, definitions, and
-constraints should be used (<a href="#compliance"
-class="sectionRef"></a>).  Briefly, a PROV compliant application is
-allowed (but not required) to treat two PROV descriptions the same
-if they are equal after applying the inference rules and possibly
-reordering expressions, and we can define a canonical form for <a title="PROV instance">PROV
-instances</a> obtained by applying all possible inference rules.  In
-addition, a validating PROV application is required to check that
-the constraints are satisfied in (the normal form of) provenance data generated or consumed by the application.
-</p>
-=======
-
->>>>>>> other
 
 <p>
 Finally, the specification includes a section (<a