diff --git a/Prerna.txt b/Prerna.txt
new file mode 100644
index 0000000..2476044
--- /dev/null
+++ b/Prerna.txt
@@ -0,0 +1 @@
+Prerna
\ No newline at end of file
diff --git a/README.md b/README.md
index f3bde9f..b6d8633 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
 # cosh
 Repo for Coderplex Open Source Hackathon
+<<<<<<< HEAD
+Intro file
+=======
 
 Shyam Kunda
+>>>>>>> e18c903117a780bb1e3b81069cb40515178fb51a