diff --git a/keyboards/pabile/p40/README.md b/keyboards/pabile/p40/README.md
index 56158f598e4..46614346d39 100644
--- a/keyboards/pabile/p40/README.md
+++ b/keyboards/pabile/p40/README.md
@@ -1,15 +1,3 @@
-<<<<<<< HEAD
-# Pabile40
-
-![prototype photo1](https://github.com/pabile/Pabile40/blob/master/_bak/web-DSCN9033.jpg)
-
-A compact 4x10 staggered keyboard DIY kit                                                                                                                                                 * [homepage](https://pabileonline.blogspot.com/search/label/pabile40)
-
-For default example layout of this keyboard, run
-
-        make pabile/p40:default
-
-=======
 # P40 
 
 A compact 4x10 (40%) staggered DIY keyboard kit
@@ -20,4 +8,3 @@ A compact 4x10 (40%) staggered DIY keyboard kit
 
 For default example of layout, run
     <code>make pabile/p40:default</code>
->>>>>>> e9f92f9b0f606ee2f46922f57c615664fbf26133