diff --git a/experiment.txt b/experiment.txt
index c150373..66232c5 100644
--- a/experiment.txt
+++ b/experiment.txt
@@ -1 +1,6 @@
-This line was added in the master branch!
+<<<<<<< HEAD
+This line was added in the experiment branch!
+
+=======
+This line was added in the homework branch!
+>>>>>>> 07c9606 (homework commit)