diff --git a/stack.c b/stack.c
index 80fba9ad379a367b60ee3131339b9b0258ea9ae9..d6821649dbd6a02e192af9a1a6b7f00e9f71c7a2 100644
--- a/stack.c
+++ b/stack.c
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #include <stdio.h>
 #include "stack.h"
 
@@ -5,4 +6,7 @@ void peek(stack s, int *value){
     if(s.top>-1 && s.top<s.capacity){
         *value=s.data[s.top];
     }
-}
\ No newline at end of file
+}
+=======
+#include "stack.h"
+>>>>>>> main