diff --git a/day14/README.md b/day14/README.md
index 3002fd0..0b68c82 100644
--- a/day14/README.md
+++ b/day14/README.md
@@ -1,7 +1,5 @@
-This is a "readme" file that usually denotes the starting place to get a grasp on the purpose of a project or subfolder.
+Mahathi just created a new file in day14. Testing testing!
+ 
+Hi!
+I am trying to create a conflictthis is bad conflic editing the same line ! yayy t
 
-We will be making edits to this file as well as creating new ones, in the hopes of demonstrating the power and nuances of git and VCSs.
-
-Edit from Shirley
-
-Baguettes are my favorite type of bread. I had one as a snack with olive oil. It was yummy!
\ No newline at end of file
diff --git a/day14/hi.txt b/day14/hi.txt
deleted file mode 100644
index e69de29..0000000