diff --git a/file2_master b/file2_master
index 25e36d7..e823be8 100644
--- a/file2_master
+++ b/file2_master
@@ -1,3 +1,8 @@
 Text1
+<<<<<<< HEAD
 Text2
 Text3
+=======
+Bravo Text1 write
+Bravo Text2 write
+>>>>>>> bravo