diff --git a/spec-generator/globals.py b/spec-generator/globals.py
index 030da5b..ed83677 100644
--- a/spec-generator/globals.py
+++ b/spec-generator/globals.py
@@ -13,6 +13,7 @@
 
 IGNORED_NODE_SHAPE_PREDICATES = (
     RDF.type,
+    RDFS.label,
     RDFS.isDefinedBy,
     SKOS.altLabel,
     SKOS.changeNote,
diff --git a/spec-generator/main.py b/spec-generator/main.py
index 806335f..21757b3 100644
--- a/spec-generator/main.py
+++ b/spec-generator/main.py
@@ -64,7 +64,6 @@ def main():
     g_shapes = load_dprod_shapes()
     
     jsonld_context_ontology = {
-<<<<<<< HEAD
             "@version": 1.1,
             "dprod": ontology_namespace_iri,
             "xsd": str(XSD),