Merge remote-tracking branch 'stevenwdv/merge-anchor-fix' into merge-anchor-fix

# Conflicts:
#	pkg/yqlib/doc/operators/anchor-and-alias-operators.md
#	pkg/yqlib/operator_anchors_aliases_test.go

pkg/yqlib/doc/operators/anchor-and-alias-operators.md

@@ -64,6 +64,38 @@ x: 1
 y: 2
 ```
 
+## Override
+see https://yaml.org/type/merge.html
+
+Given a sample.yml file of:
+```yaml
+- &CENTER
+  x: 1
+  y: 2
+- &LEFT
+  x: 0
+  y: 2
+- &BIG
+  r: 10
+- &SMALL
+  r: 1
+- !!merge <<:
+    - *BIG
+    - *LEFT
+    - *SMALL
+  x: 1
+```
+then
+```bash
+yq '.[4] | explode(.)' sample.yml
+```
+will output
+```yaml
+r: 10
+y: 2
+x: 1
+```
+
 ## Get anchor
 Given a sample.yml file of:
 ```yaml

pkg/yqlib/doc/operators/traverse-read.md

@@ -304,7 +304,7 @@ foo_a
 ```
 
 ## Traversing merge anchors with override
-This is legacy behavior, see --yaml-fix-merge-anchor-to-spec
+This is legacy behaviour, see --yaml-fix-merge-anchor-to-spec
 
 Given a sample.yml file of:
 ```yaml
@@ -401,7 +401,7 @@ foobar_thing
 ```
 
 ## Traversing merge anchor lists
-Note that the later merge anchors override previous, but this is legacy behavior, see --yaml-fix-merge-anchor-to-spec
+Note that the later merge anchors override previous, but this is legacy behaviour, see --yaml-fix-merge-anchor-to-spec
 
 Given a sample.yml file of:
 ```yaml
@@ -434,7 +434,7 @@ bar_thing
 ```
 
 ## Splatting merge anchor lists
-With legacy override behavior, see --yaml-fix-merge-anchor-to-spec
+With legacy override behaviour, see --yaml-fix-merge-anchor-to-spec
 
 Given a sample.yml file of:
 ```yaml