2 files changed, 16 insertions, 1 deletions

diff --git a/src/Data/JLD/Model/Keyword.hs b/src/Data/JLD/Model/Keyword.hs
index 10835a9..ab86164 100644
--- a/src/Data/JLD/Model/Keyword.hs
+++ b/src/Data/JLD/Model/Keyword.hs
@@ -32,6 +32,7 @@ data Keyword
     | KeywordJson
     | KeywordLanguage
     | KeywordList
+    | KeywordMerged
     | KeywordNest
     | KeywordNone
     | KeywordNull
@@ -68,6 +69,7 @@ instance Show Keyword where
         KeywordJson -> "@json"
         KeywordLanguage -> "@language"
         KeywordList -> "@list"
+        KeywordMerged -> "@merged"
         KeywordNest -> "@nest"
         KeywordNone -> "@none"
         KeywordNull -> "@null"
@@ -103,6 +105,7 @@ parseKeyword = \case
     "@json" -> Just KeywordJson
     "@language" -> Just KeywordLanguage
     "@list" -> Just KeywordList
+    "@merged" -> Just KeywordMerged
     "@nest" -> Just KeywordNest
     "@none" -> Just KeywordNone
     "@null" -> Just KeywordNull
diff --git a/src/Data/JLD/Model/NodeMap.hs b/src/Data/JLD/Model/NodeMap.hs
index 48db17e..d0fb2f9 100644
--- a/src/Data/JLD/Model/NodeMap.hs
+++ b/src/Data/JLD/Model/NodeMap.hs
@@ -1,4 +1,16 @@
-module Data.JLD.Model.NodeMap (NodeMap, lookup, lookup2, lookup3, insert, modifyArray, hasKey2, hasKey3, memberArray) where
+module Data.JLD.Model.NodeMap (
+    NodeMap,
+    SubjectMap,
+    PropertyMap,
+    lookup,
+    lookup2,
+    lookup3,
+    insert,
+    modifyArray,
+    hasKey2,
+    hasKey3,
+    memberArray,
+) where
 
 import Data.JLD.Prelude hiding (modify)