Merge master fix

pkg/yqlib/encoder.go

@@ -59,13 +59,13 @@ type jsonEncoder struct {
 }
 
 func mapKeysToStrings(node *yaml.Node) {
-	
+
 	if node.Kind == yaml.MappingNode {
 		for index, child := range node.Content {
-			if index % 2 == 0 { // its a map key
+			if index%2 == 0 { // its a map key
 				child.Tag = "!!str"
 			}
-		}	
+		}
 	}
 
 	for _, child := range node.Content {

pkg/yqlib/update_navigation_strategy.go

@@ -29,7 +29,7 @@ func UpdateNavigationStrategy(updateCommand UpdateCommand, autoCreate bool) Navi
 				}
 				node.Anchor = changesToApply.Anchor
 				node.Alias = changesToApply.Alias
-				if !updateCommand.DontUpdateComments {
+				if updateCommand.CommentsMergeStrategy != IgnoreCommentsMergeStrategy {
 					node.HeadComment = changesToApply.HeadComment
 					node.LineComment = changesToApply.LineComment
 					node.FootComment = changesToApply.FootComment