diff --git a/.gitignore b/.gitignore
index 53bbfa5..9b3b29a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ go.work.sum
 # env file
 .env
 
+internal
 avro
 experiments
 map.go
diff --git a/cmd/.gitignore b/cmd/.gitignore
index 116fd80..ca83256 100644
--- a/cmd/.gitignore
+++ b/cmd/.gitignore
@@ -1,3 +1,7 @@
 *.json
+<<<<<<< Updated upstream
 *.bak
-main?.go
\ No newline at end of file
+main?.go
+=======
+*.bak
+>>>>>>> Stashed changes