add changelog

Author: ebeahan

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