diff --git a/your-code/about-me.md b/your-code/about-me.md
index 31b9128..0c9755a 100644
--- a/your-code/about-me.md
+++ b/your-code/about-me.md
@@ -1,5 +1,5 @@
 
-# Who am I
+# Who am I -> This is just a small change
 
 * I was born in Venezuela but moved to Algarve when I was 13.
 * I have a PhD in Neuroscience but have no intention of staying in academia.
diff --git a/your-code/about-me_v2.md b/your-code/about-me_v2.md
new file mode 100644
index 0000000..0cd05cb
--- /dev/null
+++ b/your-code/about-me_v2.md
@@ -0,0 +1,3 @@
+This is a test file for testing conflicts.
+
+What happens when i make different changes on a different file?