--- a/ontology/ProvenanceOntology.owl	Thu Apr 26 10:17:13 2012 -0400
+++ b/ontology/ProvenanceOntology.owl	Thu Apr 26 10:47:20 2012 -0400
@@ -1678,38 +1678,6 @@
         <rdfs:comment xml:lang="en">An instance of prov:Usage provides additional descriptions about the binary prov:used relation from some prov:Activity to an prov:Entity that it used. For example, :keynote prov:used :podium; prov:qualified [ a prov:Usage; prov:entity :podium; :foo :bar ].</rdfs:comment>
         <prov:unqualifiedForm rdf:resource="&prov;used"/>
     </owl:Class>
-<<<<<<< local
-=======
-    
->>>>>>> other
-
-<<<<<<< local
-=======
-
-    <!-- 
-    ///////////////////////////////////////////////////////////////////////////////////////
-    //
-    // Individuals
-    //
-    ///////////////////////////////////////////////////////////////////////////////////////
-     -->
-
-    
-
-
-    <!-- http://www.w3.org/ns/prov#Plan -->
-
-    <owl:NamedIndividual rdf:about="&prov;Plan">
-        <rdfs:label>Plan</rdfs:label>
-        <prov:prov-dm-constraints>http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm-constraints.html#term-Association</prov:prov-dm-constraints>
-        <prov:definition>A plan is an entity that represents a set of actions or steps intended by one or more agents to achieve some goals.</prov:definition>
-        <rdfs:comment xml:lang="en">There exist no prescriptive requirement on the nature of plans, their representation, the actions or steps they consist of, or their intended goals. Since plans may evolve over time, it may become necessary to track their provenance, so plans themselves are entities. Representing the plan explicitly in the provenance can be useful for various tasks: for example, to validate the execution as represented in the provenance record, to manage expectation failures, or to provide explanations.</rdfs:comment>
-        <prov:prov-dm>http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html#section-types-entities-agents</prov:prov-dm>
-        <prov:prov-n>http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html#expression-Association</prov:prov-n>
-        <prov:category>qualified</prov:category>
-        <prov:component>agents-responsibility</prov:component>
-    </owl:NamedIndividual>
->>>>>>> other
 </rdf:RDF>