diff --git a/play/a.txt b/play/a.txt
index 546f196..a7c1ad0 100644
--- a/play/a.txt
+++ b/play/a.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 file one
 
 file two