diff --git a/newfile b/newfile
new file mode 100644
index 0000000..1a457da
--- /dev/null
+++ b/newfile
@@ -0,0 +1,2 @@
+newfile for conflict
+