diff --git a/experiment.txt b/experiment.txt
index c150373..30bc8fb 100644
--- a/experiment.txt
+++ b/experiment.txt
@@ -1 +1,9 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
 This line was added in the master branch!
+=======
+This line was added in the experiment branch!
+>>>>>>> e29acfe (Update experiment.txt)
+=======
+This line was added in the homework branch!
+>>>>>>> ddb4c3f (Fix experiment to homework)