diff --git a/newfile2.txt b/newfile2.txt
index 37f3c1f..1d941b7 100644
--- a/newfile2.txt
+++ b/newfile2.txt
@@ -1,2 +1,6 @@
 new file2
+<<<<<<< HEAD
 uuuuuuuu
+=======
+wwwwwwww
+>>>>>>> 53ae6021d868f894eecda7cc3f547533910ccbf8