--- a/1.txt
+++ b/1.txt
@@ -0,0 +1 @@
 189
--- a/README.md
+++ b/README.md
@@ -1,5 +0,0 @@
 <<<<<<< HEAD
 123445
 =======
 123479
 >>>>>>> feature-x
--- a/README_BACKUP_1535.md
+++ b/README_BACKUP_1535.md
@@ -1,5 +0,0 @@
 <<<<<<< HEAD
 123445
 =======
 123479
 >>>>>>> feature-x
--- a/README_BASE_1535.md
+++ b/README_BASE_1535.md
@@ -1 +0,0 @@
 123489
--- a/README_LOCAL_1535.md
+++ b/README_LOCAL_1535.md
@@ -1 +0,0 @@
 123445
--- a/README_REMOTE_1535.md
+++ b/README_REMOTE_1535.md
@@ -1 +0,0 @@
 123479