diff --git a/pkg/yqlib/decoder_base64.go b/pkg/yqlib/decoder_base64.go
index 5f291234..2e45fef6 100644
--- a/pkg/yqlib/decoder_base64.go
+++ b/pkg/yqlib/decoder_base64.go
@@ -1,4 +1,3 @@
-
 //go:build !yq_nobase64
 
 package yqlib
diff --git a/pkg/yqlib/decoder_csv_object.go b/pkg/yqlib/decoder_csv_object.go
index 787f0f67..6d7c31d4 100644
--- a/pkg/yqlib/decoder_csv_object.go
+++ b/pkg/yqlib/decoder_csv_object.go
@@ -1,4 +1,3 @@
-
 //go:build !yq_nocsv
 
 package yqlib
diff --git a/project-words.txt b/project-words.txt
index 12d5b3fc..0fa9e3d3 100644
--- a/project-words.txt
+++ b/project-words.txt
@@ -258,9 +258,13 @@ nolint
 shortfile
 Unmarshalling
 noini
+<<<<<<< Updated upstream
 nocsv
 nobase64
 nouri
 noprops
 nosh
-noshell
\ No newline at end of file
+noshell
+=======
+tinygo
+>>>>>>> Stashed changes