Add Five Safes Crate profile to upstream RO-Crate 1.2 base

EttoreM · EttoreM · commit 5fa806857fa5 · 2026-07-17T16:21:06.000+01:00
diff --git a/rocrate_validator/profiles/five-safes-crate/0_workflow_run_inference.ttl b/rocrate_validator/profiles/five-safes-crate/0_workflow_run_inference.ttl
@@ -12,7 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
diff --git a/rocrate_validator/profiles/five-safes-crate/10_outputs.ttl b/rocrate_validator/profiles/five-safes-crate/10_outputs.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/11_workflow_execution_phase.ttl b/rocrate_validator/profiles/five-safes-crate/11_workflow_execution_phase.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
@@ -75,7 +79,11 @@ five-safes-crate:WorkflowexecutionObjectHasEndTimeIfEnded
         a sh:SPARQLTarget ;
         sh:select """
             PREFIX schema: <http://schema.org/>
+<<<<<<< HEAD
             PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/>
+=======
+            PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/>
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 
             SELECT ?this
             WHERE {
@@ -115,7 +123,11 @@ five-safes-crate:WorkflowexecutionObjectHasStartTimeIfBegun
         a sh:SPARQLTarget ;
         sh:select """
             PREFIX schema: <http://schema.org/>
+<<<<<<< HEAD
             PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/>
+=======
+            PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/>
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 
             SELECT ?this
             WHERE {
diff --git a/rocrate_validator/profiles/five-safes-crate/12_check_phase.ttl b/rocrate_validator/profiles/five-safes-crate/12_check_phase.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/13_validation_phase.ttl b/rocrate_validator/profiles/five-safes-crate/13_validation_phase.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/14_workflow_retrieval_phase.ttl b/rocrate_validator/profiles/five-safes-crate/14_workflow_retrieval_phase.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/15_metadata_file.ttl b/rocrate_validator/profiles/five-safes-crate/15_metadata_file.ttl
@@ -12,7 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/16_publishing_phase.ttl b/rocrate_validator/profiles/five-safes-crate/16_publishing_phase.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/1_requesting_agent.ttl b/rocrate_validator/profiles/five-safes-crate/1_requesting_agent.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/1_responsible_project.ttl b/rocrate_validator/profiles/five-safes-crate/1_responsible_project.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/1_root_data_entity.ttl b/rocrate_validator/profiles/five-safes-crate/1_root_data_entity.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/2_requesting_agent.ttl b/rocrate_validator/profiles/five-safes-crate/2_requesting_agent.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/3_timestamp_format.ttl b/rocrate_validator/profiles/five-safes-crate/3_timestamp_format.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/4_sign_off.ttl b/rocrate_validator/profiles/five-safes-crate/4_sign_off.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
@@ -190,7 +194,11 @@ five-safes-crate:SignOffPhaseProperties
         sh:description "Check if the Sign Off phase lists the workflow as an object" ;
         sh:select """
             PREFIX schema: <http://schema.org/>
+<<<<<<< HEAD
             PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/>
+=======
+            PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/>
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
             SELECT $this
             WHERE {
                 ?root a schema:Dataset ;
@@ -209,7 +217,11 @@ five-safes-crate:SignOffPhaseProperties
         sh:description "Check if the Sign Off phase lists the Responsible Project as an object" ;
         sh:select """
             PREFIX schema: <http://schema.org/>
+<<<<<<< HEAD
             PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/>
+=======
+            PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/>
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
             SELECT $this
             WHERE {
                 ?root a schema:Dataset ;
diff --git a/rocrate_validator/profiles/five-safes-crate/5_profile_conformance.ttl b/rocrate_validator/profiles/five-safes-crate/5_profile_conformance.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/6_workflow_reference.ttl b/rocrate_validator/profiles/five-safes-crate/6_workflow_reference.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/7_requested_workflow_run.ttl b/rocrate_validator/profiles/five-safes-crate/7_requested_workflow_run.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/8_disclosure_phase.ttl b/rocrate_validator/profiles/five-safes-crate/8_disclosure_phase.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/9_inputs.ttl b/rocrate_validator/profiles/five-safes-crate/9_inputs.ttl
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 @prefix ro: <./> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix schema: <http://schema.org/> .
diff --git a/rocrate_validator/profiles/five-safes-crate/ontology.ttl b/rocrate_validator/profiles/five-safes-crate/ontology.ttl
@@ -21,7 +21,11 @@
 @prefix schema: <http://schema.org/> .
 @prefix rocrate: <https://w3id.org/ro/crate/1.1/> .
 @prefix bioschemas: <https://bioschemas.org/> .
+<<<<<<< HEAD
 @prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
+=======
+@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/> .
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 @prefix isa-ro-crate: <https://github.com/crs4/rocrate-validator/profiles/isa-ro-crate/> .
 
 <urn:absolute:.> rdf:type owl:Ontology ;
diff --git a/rocrate_validator/profiles/five-safes-crate/profile.ttl b/rocrate_validator/profiles/five-safes-crate/profile.ttl
@@ -34,7 +34,11 @@
     # prof:isProfileOf <https://w3id.org/ro/wfrun/workflow/0.5> ;
 
     # This profile is a transitive profile of the RO-Crate Metadata Specification
+<<<<<<< HEAD
     prof:isTransitiveProfileOf <https://w3id.org/ro/crate/1.1> ;
+=======
+    prof:isTransitiveProfileOf <https://w3id.org/ro/crate/1.2> ;
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
     # TODO: resolve failures when these profiles are applied
     #                            <https://w3id.org/ro/wfrun/process/0.5> ,
     #                            <https://w3id.org/workflowhub/workflow-ro-crate/1.0> ;
diff --git a/tests/data/crates/valid/five-safes-crate-result/ro-crate-metadata.json b/tests/data/crates/valid/five-safes-crate-result/ro-crate-metadata.json
@@ -393,6 +393,11 @@
             "@id": "https://tre72.example.com/#crate-validator",
             "@type": "SoftwareApplication",
             "name": "RO-Crate validator at TRE72",
+<<<<<<< HEAD
+=======
+            "url": "https://tre72.example.com/#crate-validator",
+            "version": "1.0",
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
             "provider": {
                 "@id": "https://tre72.example.com/"
             }
diff --git a/tests/integration/profiles/five-safes-crate/test_valid_5src.py b/tests/integration/profiles/five-safes-crate/test_valid_5src.py
@@ -18,7 +18,10 @@
 
 from rocrate_validator import services
 from rocrate_validator.models import Severity
+<<<<<<< HEAD
 from tests.conftest import SKIP_LOCAL_DATA_ENTITY_EXISTENCE_CHECK_IDENTIFIER
+=======
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 from tests.ro_crates import ValidROC
 from tests.shared import do_entity_test
 
@@ -28,6 +31,7 @@
 # Dynamically fetch the SKIP_WEB_RESOURCE_AVAILABILITY_IDENTIFIER
 # required as disable_inherited_profiles_reporting does not disable Python checks from
 # inherited profiles (https://github.com/crs4/rocrate-validator/issues/135)
+<<<<<<< HEAD
 rocrate_profile = services.get_profile("ro-crate")
 if not rocrate_profile:
     raise RuntimeError("Unable to load the RO-Crate profile")
@@ -37,6 +41,22 @@
 assert (
     check_local_data_entity_existence
 ), "Unable to find the requirement 'Web-based Data Entity: resource availability'"
+=======
+rocrate_profile = services.get_profile("ro-crate-1.2")
+if not rocrate_profile:
+    raise RuntimeError("Unable to load the RO-Crate 1.2 profile")
+check_local_data_entity_existence = rocrate_profile.get_requirement_check(
+    "Data Entity: REQUIRED resource availability"
+)
+assert check_local_data_entity_existence, "Unable to find the requirement 'Data Entity: REQUIRED resource availability'"
+SKIP_LOCAL_DATA_ENTITY_EXISTENCE_CHECK_IDENTIFIER = check_local_data_entity_existence.identifier
+check_local_data_entity_existence = rocrate_profile.get_requirement_check(
+    "Web-based Data Entity: REQUIRED resource availability"
+)
+assert (
+    check_local_data_entity_existence
+), "Unable to find the requirement 'Web-based Data Entity: REQUIRED resource availability'"
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 SKIP_WEB_RESOURCE_AVAILABILITY_IDENTIFIER = check_local_data_entity_existence.identifier
 
 
diff --git a/tests/ro_crates.py b/tests/ro_crates.py
@@ -1004,8 +1004,12 @@ def propertyvalue_no_unitcode(self) -> Path:
 
 
 class Invalid5sROC:
+<<<<<<< HEAD
 
     base_path = INVALID_CRATES_DATA_PATH / "five_safes_crate/"
+=======
+    base_path = INVALID_CRATES_DATA_PATH / "five_safes_crate"
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 
     @property
     def context_multiple_wrong_version(self) -> Path:
diff --git a/tests/shared.py b/tests/shared.py
@@ -40,7 +40,11 @@
 PREFIX schema: <http://schema.org/>
 PREFIX shp:    <https://w3id.org/shp#>
 PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+<<<<<<< HEAD
 PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/>
+=======
+PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/>
+>>>>>>> ab465be7 (Add Five Safes Crate profile to upstream RO-Crate 1.2 base)
 PREFIX dct: <http://purl.org/dc/terms/>
 """
 
