diff --git a/.gitattributes b/.gitattributes
index dd57308..941a842 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,11 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 =======
 *.c16 filter=lfs diff=lfs merge=lfs -text
 *.RAW filter=lfs diff=lfs merge=lfs -text
 *.C16 filter=lfs diff=lfs merge=lfs -text
 >>>>>>> Stashed changes
+=======
+>>>>>>> parent of c6478ea... November 2022 Update