diff --git a/4-Nov.txt b/4-Nov.txt
index 99da3b6..26fc0c6 100644
--- a/4-Nov.txt
+++ b/4-Nov.txt
@@ -1 +1,6 @@
+<<<<<<< HEAD
 4 November 2018
+Samartha S M	samarthamahesh	samarthamahesh@gmail.com
+=======
+
+>>>>>>> 6147da25f47a36c6f13ba2c47e48e9756d1d2dab