diff --git a/new-file b/new-file
index fe50db0..42139be 100644
--- a/new-file
+++ b/new-file
@@ -1,3 +1,5 @@
 this is not a conflict!!!
 edit
 edit2
+edit3
+edit4