diff --git a/BATCH1 b/BATCH1
index dceed52..5b87f8d 100644
--- a/BATCH1
+++ b/BATCH1
@@ -1 +1 @@
-Testing batch 1
+Testing batch 1 with conflicts