diff --git a/file.txt b/file.txt
index f8f28a2..1c7b183 100644
--- a/file.txt
+++ b/file.txt
@@ -1,3 +1,5 @@
 This is a very important feature of this project!
 
-This feature will not be changed in the near future!
+<<<<<<< HEAD
+This feature was approved by the big boss.
+>>>>>>>