diff --git a/non.c b/non.c
index 82038be..a698e35 100644
--- a/non.c
+++ b/non.c
@@ -1 +1,5 @@
+<<<<<<< HEAD
 THANUSAN LE LAITIER
+=======
+//test
+>>>>>>> f4b9ad78bc76c8a5f10ca8c8291f0426d0dbae19