diff --git a/requirements.txt b/requirements.txt
index 2ac26d3..a27ea75 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,8 @@
 keyboard==0.13.5
 pyperclip==1.9.0
 pystray==0.19.5
-Pillow==12.0.0
\ No newline at end of file
+<<<<<<< HEAD
+Pillow==12.0.0
+=======
+Pillow==12.0.0
+>>>>>>> 4143eb7dfbdcc5a646f23c1fc5369779d41c4f4a