diff --git a/your-code/about-me.md b/your-code/about-me.md
index 1b7eff3..cff092c 100644
--- a/your-code/about-me.md
+++ b/your-code/about-me.md
@@ -1,5 +1 @@
-NEW BRANCH - MODIFIED TO PROVOKE A CONFLICT, FIXED AFTERWARDS ----
-
-Carla is a passionate, honest, web developer musician and financier.
-
-Learning the new tech world lingo and pursuing all passions while trying to watch all the top 250 movies she can find.
+this will make a conflict
\ No newline at end of file