diff --git a/mars.txt b/mars.txt
index aab54d6..1e9bd1d 100644
--- a/mars.txt
+++ b/mars.txt
@@ -3,4 +3,6 @@ The two moons may be a problem for Wolfman
 But the mummy will appreciate the lack of humidity
 Let's figure out how to get to Mars first
 
-Conflict has been resolved by change both lines into this one. 
+This is a new line Ximena added to branch XMG-pratice on 8/10/2021.
+
+This is another line added to branch XMG-practice.
\ No newline at end of file