diff --git a/conflicting b/conflicting
index 8b13789..4c0e7b9 100644
--- a/conflicting
+++ b/conflicting
@@ -1 +1 @@
-
+it's a conflict