--- a/paq/provenance-access.html	Wed Aug 17 13:49:29 2011 +0100
+++ b/paq/provenance-access.html	Wed Aug 17 13:50:17 2011 +0100
@@ -229,11 +229,7 @@
           When used in conjunction with an HTTP success response code (<code>2xx</code>), this HTTP header indicates that <code><cite>provenance-URI</cite></code> is the URI of some provenance for the requested resource and that the associated resource context is identified by <code><cite>context-URI</cite></code>. 
         </p>
         <p>
-<<<<<<< local
         If no <code>anchor</code> link is provided then the <code><cite>context-URI</cite></code> is assumed to be the URI of the resource.
-=======
-        If no target link is provided then the <code><cite>target-URI</cite></code> is assumed to be the URI of the resources. It is RECOMMENDED that this only be done when the resource is a provenance model Entity.
->>>>>>> other
         </p>
         <p>  
           At this time, the meaning of these links returned with other HTTP response codes is not defined: future revisions of this specification may define interpretations for these.
@@ -284,7 +280,6 @@
           The <code><cite>context-URI</cite></code> given by the <code>anchor</code> link element specifies an identifier for the presented document view, and which may be used within the provenance information when referring to this document.
         </p>
         <p>
-<<<<<<< local
           An HTML document header MAY include multiple "provenance" link elements, indicating a number of different resources that are known to the creator of the document, each providing provenance about the document. 
         </p>
         <p>
@@ -292,9 +287,6 @@
         </p>
         <p>
         If no "anchor" link element is provided then the <code><cite>context-URI</cite></code> is assumed to be the URI of the document. It is RECOMMENDED that this only be done when the document is static.
-=======
-        If no target link element is provided then the <code><cite>target-URI</cite></code> is assumed to be the URI of the document. It is RECOMMENDED that this only be done when the document is a provenance model Entity.
->>>>>>> other
         </p>
 
         <section>