--- a/paq/provenance-access.html	Wed Aug 17 13:47:31 2011 +0100
+++ b/paq/provenance-access.html	Wed Aug 17 13:49:29 2011 +0100
@@ -143,21 +143,10 @@
             <dt>Service-URI</dt>
             <dd>the URI of a Provenance Service.</dd>
             <dt>Resource</dt>
-<<<<<<< local
             <dd>a web resource, as <a href="http://www.w3.org/TR/webarch/#id-resources">described</a> by the Architecture of the World Wide Web [[WEBARCH]], section 2.2. A resource may be associated with multiple contexts (see <a href="#provenance-context"></a> for discussion)</dd>
-=======
-            <dd>a web resource. A resource may itself be a target but also can be associated with multiple targets.</dd>
->>>>>>> other
           </dl>
         </p>
 
-<<<<<<< local
-=======
-		<p>
-		A key notion within these concepts is that a resource may not be the same as a target. Within provenance information, a resource may be described by one or more provenance model:Entities. Thus, a target refers to a provenance model:Entity and a Target-URI allows the target to be found within provenance information. Where a resource is a provenance model:Entity then it can be used as a target. 
-		</p>
-		
->>>>>>> other
         <p class="issue">
           The terms context and context-URI are chosen to align with terminology used in describing the HTTP link header (a href="http://tools.ietf.org/html/rfc5988#section-5.2£>http://tools.ietf.org/html/rfc5988#section-5.2</a>) - does this terminology work in the current (ahem) context?  See also next section.
         </p>