diff --git a/stack.c b/stack.c
index d6821649dbd6a02e192af9a1a6b7f00e9f71c7a2..00282e3165b1f61a2ea289dd63c01defcc7e5d18 100644
--- a/stack.c
+++ b/stack.c
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #include <stdio.h>
 #include "stack.h"
 
@@ -7,6 +6,3 @@ void peek(stack s, int *value){
         *value=s.data[s.top];
     }
 }
-=======
-#include "stack.h"
->>>>>>> main