--- a/ontology/examples/ontology-extensions/crime-file/crime.owl	Wed Oct 05 16:28:43 2011 -0400
+++ b/ontology/examples/ontology-extensions/crime-file/crime.owl	Wed Oct 05 16:30:28 2011 -0400
@@ -8,16 +8,30 @@
     <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#" >
     <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#" >
     <!ENTITY prov "http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/ProvenanceOntology.owl#" >
+<<<<<<< local
+=======
+    <!ENTITY crime-file "http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/" >
+>>>>>>> other
     <!ENTITY crime "http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#" >
 ]>
 
 
+<<<<<<< local
 <rdf:RDF xmlns="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#"
      xml:base="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#"
+=======
+<rdf:RDF xmlns="&crime-file;crime.owl#"
+     xml:base="&crime-file;crime.owl"
+>>>>>>> other
      xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
      xmlns:prov="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/ProvenanceOntology.owl#"
      xmlns:owl2xml="http://www.w3.org/2006/12/owl2-xml#"
+<<<<<<< local
      xmlns:crime="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#"
+=======
+     xmlns:crime-file="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/"
+     xmlns:crime="&crime-file;crime.owl#"
+>>>>>>> other
      xmlns:owl="http://www.w3.org/2002/07/owl#"
      xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
@@ -44,12 +58,24 @@
     
 
 
+<<<<<<< local
     <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#hadFilePath -->
+=======
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/hadFilePath -->
+>>>>>>> other
 
+<<<<<<< local
     <owl:ObjectProperty rdf:about="&crime;hadFilePath">
+=======
+    <owl:ObjectProperty rdf:about="&crime-file;hadFilePath">
+>>>>>>> other
         <rdfs:range rdf:resource="&prov;Location"/>
         <rdfs:subPropertyOf rdf:resource="&prov;hadLocation"/>
+<<<<<<< local
         <rdfs:domain rdf:resource="&crime;CrimeFile"/>
+=======
+        <rdfs:domain rdf:resource="&crime-file;CrimeFile"/>
+>>>>>>> other
     </owl:ObjectProperty>
     
 
@@ -65,9 +91,17 @@
     
 
 
+<<<<<<< local
     <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#hadFileContent -->
+=======
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/hasFileContent -->
+>>>>>>> other
 
+<<<<<<< local
     <owl:DatatypeProperty rdf:about="&crime;hadFileContent"/>
+=======
+    <owl:DatatypeProperty rdf:about="&crime-file;hasFileContent"/>
+>>>>>>> other
     
 
 
@@ -106,57 +140,113 @@
     
 
 
+<<<<<<< local
     <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#CrimeFile -->
+=======
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/CrimeFile -->
+>>>>>>> other
 
+<<<<<<< local
     <owl:Class rdf:about="&crime;CrimeFile">
+=======
+    <owl:Class rdf:about="&crime-file;CrimeFile">
+>>>>>>> other
         <rdfs:subClassOf rdf:resource="&prov;Entity"/>
     </owl:Class>
     
 
 
+<<<<<<< local
     <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#EmailProcessExecution -->
+=======
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/EmailProcessExecution -->
+>>>>>>> other
 
+<<<<<<< local
     <owl:Class rdf:about="&crime;EmailProcessExecution">
-        <rdfs:subClassOf rdf:resource="&prov;ProcessExecution"/>
-    </owl:Class>
-    
-
-
-    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#FileAppending -->
-
-    <owl:Class rdf:about="&crime;FileAppending">
+=======
+    <owl:Class rdf:about="&crime-file;EmailProcessExecution">
+>>>>>>> other
         <rdfs:subClassOf rdf:resource="&prov;ProcessExecution"/>
     </owl:Class>
     
 
 
-    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#FileCreation -->
+<<<<<<< local
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#FileAppending -->
+=======
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/FileAppending -->
+>>>>>>> other
 
-    <owl:Class rdf:about="&crime;FileCreation">
+<<<<<<< local
+    <owl:Class rdf:about="&crime;FileAppending">
+=======
+    <owl:Class rdf:about="&crime-file;FileAppending">
+>>>>>>> other
         <rdfs:subClassOf rdf:resource="&prov;ProcessExecution"/>
     </owl:Class>
     
 
 
-    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#FileEditing -->
+<<<<<<< local
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#FileCreation -->
+=======
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/FileCreation -->
+>>>>>>> other
 
-    <owl:Class rdf:about="&crime;FileEditing">
+<<<<<<< local
+    <owl:Class rdf:about="&crime;FileCreation">
+=======
+    <owl:Class rdf:about="&crime-file;FileCreation">
+>>>>>>> other
         <rdfs:subClassOf rdf:resource="&prov;ProcessExecution"/>
     </owl:Class>
     
 
 
+<<<<<<< local
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#FileEditing -->
+=======
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/FileEditing -->
+>>>>>>> other
+
+<<<<<<< local
+    <owl:Class rdf:about="&crime;FileEditing">
+=======
+    <owl:Class rdf:about="&crime-file;FileEditing">
+>>>>>>> other
+        <rdfs:subClassOf rdf:resource="&prov;ProcessExecution"/>
+    </owl:Class>
+    
+
+
+<<<<<<< local
     <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#Journalist -->
+=======
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/Journalist -->
+>>>>>>> other
 
+<<<<<<< local
     <owl:Class rdf:about="&crime;Journalist">
+=======
+    <owl:Class rdf:about="&crime-file;Journalist">
+>>>>>>> other
         <rdfs:subClassOf rdf:resource="&prov;Agent"/>
     </owl:Class>
     
 
 
+<<<<<<< local
     <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/crime.owl#SpellChecking -->
+=======
+    <!-- http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/examples/ontology-extensions/crime-file/SpellChecking -->
+>>>>>>> other
 
+<<<<<<< local
     <owl:Class rdf:about="&crime;SpellChecking">
+=======
+    <owl:Class rdf:about="&crime-file;SpellChecking">
+>>>>>>> other
         <rdfs:subClassOf rdf:resource="&prov;ProcessExecution"/>
     </owl:Class>
 </rdf:RDF>