diff --git a/feature b/feature
index d2cc393..eaa2eb6 100644
--- a/feature
+++ b/feature
@@ -1 +1 @@
-conflict 1
+feature4