From e605b838ac55167db554ce38c0b6acbeadad7b36 Mon Sep 17 00:00:00 2001
From: Pam Selle <pam@hashicorp.com>
Date: Mon, 17 Jun 2019 10:23:21 -0400
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21eddc8fc..9d090b844 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ ENHANCEMENTS:
 * config: add GCS source support for modules [GH-21254]
 * command/format: Reduce extra whitespaces & new lines [GH-21334]
 
+BUG FIXES:
+
+* lang/funcs: Fix `merge` panic on null values. Now will give an error if null used [GH-21695] 
+
 ## 0.12.2 (June 12, 2019)
 
 NEW FEATURES: