diff --git a/.gitignore b/.gitignore
index dc5415a..76fb994 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,4 +138,7 @@ dist
 
 # Vite logs files
 vite.config.js.timestamp-*
+<<<<<<< HEAD
+vite.config.ts.timestamp-*
+=======
 vite.config.ts.timestamp-*
\ No newline at end of file