diff --git a/textForCommit.txt b/textForCommit.txt
index f71f333f9..59421d26e 100644
--- a/textForCommit.txt
+++ b/textForCommit.txt
@@ -1,4 +1,10 @@
+<<<<<<< HEAD
 branch_2: 1st edit
 branch_2: 2nd edit
 branch_2: 3d edit
+=======
+branch_1: 1st edit
+branch_1: 2nd edit
+branch_1: 3d edit
+>>>>>>> branch_1