diff --git a/conflict_demo.txt b/conflict_demo.txt
deleted file mode 100644
index c8a2007..0000000
--- a/conflict_demo.txt
+++ /dev/null
@@ -1 +0,0 @@
-Lisi wrote this line