From e1588bfe09062dcb95799a4411676236530d30d8 Mon Sep 17 00:00:00 2001
From: Eric Beahan <eric.beahan@elastic.co>
Date: Tue, 27 Oct 2020 13:54:40 -0500
Subject: [PATCH] add changelog

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

diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
index c05fd1c2f7..be2c38a488 100644
--- a/CHANGELOG.next.md
+++ b/CHANGELOG.next.md
@@ -35,7 +35,11 @@ Thanks, you're awesome :-) -->
 * Added the `path` key when type is `alias`, to support the [alias field type](https://www.elastic.co/guide/en/elasticsearch/reference/current/alias.html). #877
 * Added support for `scaled_float`'s mandatory parameter `scaling_factor`. #1042
 * Added ability for --oss flag to fall back `constant_keyword` to `keyword`. #1046
+<<<<<<< HEAD
 * Added support in the generated Go source go for `wildcard`, `version`, and `constant_keyword` data types. #1050
+=======
+* Added support for marking fields as beta in the documentation. #1051
+>>>>>>> add changelog
 
 #### Improvements