From 09d7c8d16d483d059513cf85444fbef01ff92d86 Mon Sep 17 00:00:00 2001
From: david-waltermire-nist <david.waltermire@nist.gov>
Date: Tue, 1 Oct 2019 12:51:13 -0400
Subject: [PATCH] fixed merge error

---
 src/metaschema/oscal_metadata_metaschema.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/metaschema/oscal_metadata_metaschema.xml b/src/metaschema/oscal_metadata_metaschema.xml
index 5d05122442..988d6dc80e 100644
--- a/src/metaschema/oscal_metadata_metaschema.xml
+++ b/src/metaschema/oscal_metadata_metaschema.xml
@@ -37,8 +37,8 @@
       <description>Provides information about the publication and availability of the containing document.</description>
       <model>
          <field ref="title" min-occurs="1"/>
-         <field ref="publication-date"/>
-         <field ref="last-modified-date" min-occurs="1"/>
+         <field ref="published"/>
+         <field ref="last-modified" min-occurs="1"/>
          <field ref="version" min-occurs="1"/>
          <field ref="oscal-version" min-occurs="1"/>
          <field ref="doc-id" max-occurs="unbounded">