diff --git a/example.txt b/example.txt
index 934b5c7..c8817c2 100644
--- a/example.txt
+++ b/example.txt
@@ -1,5 +1,13 @@
-Tech Thursday assignment 3 
+Tech Thursday assignment 3 updated
 date 10-09-2025
+<<<<<<< HEAD
 wed
 wednesday 
 assignment completed
+=======
+wednesday
+Practise session extended to Thursday
+date 11-09-2025
+New text added
+line added from feature-1 branch
+>>>>>>> 06f4ad109d06b03307110696e71d6e7166aaf2b7