--- a/model/ProvenanceModel.html	Mon Sep 19 09:02:12 2011 +0100
+++ b/model/ProvenanceModel.html	Mon Sep 19 09:12:29 2011 +0100
@@ -257,12 +257,11 @@
 </div>
 
 
-<p>The data model is designed to capture events that happened in the past, as opposed to event
+<p>The data model is designed to capture events that happened in the past, as opposed to events
 that may or will happen. 
 However, this distinction is not formally enforced.
 Therefore, all PROV-DM assertions SHOULD be interpreted as a record of what has happened, as opposed to what may or will happen.</p>
 
-<div class='note'>Can this be enforced formally?</div>
 
 
 <p> 
@@ -299,12 +298,8 @@
 </div>
 -->
 
-<<<<<<< local
-The following diagram provides a high level overview of the PROV-DM. Examples of a set of provenance assertions that conform to this schema are provided in the next section.
-=======
 <p>
-The following diagram provides a very high level overview of the PROV-DM. Examples of a set of provenance assertions that conform to this schema are provided in the next section.</p>
->>>>>>> other
+The following diagram provides a high level overview of the PROV-DM. Examples of a set of provenance assertions that conform to this schema are provided in the next section.</p>
 
   <img src="overview.png" align="center"/>