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