diff --git a/main.c b/main.c
index a3271f3..a5c6f5e 100644
--- a/main.c
+++ b/main.c
@@ -1 +1,6 @@
+<<<<<<< HEAD
 Ba test yasmine 
+=======
+gfhdre
+test 2 modification
+>>>>>>> 454eda0e492a0b8ef2951973c9a3c8556afafa05