diff --git a/README.md b/README.md
index 2f379e39e7a4..7971f277595f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 #TODO
 =======
 # How do I submit patches to Android Common Kernels
+=======
+# .How do I submit patches to Android Common Kernels
+>>>>>>> parent of 65a1eeb07 (remove standard README.md)
 
 1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases.
    These patches will be merged automatically in the corresponding common kernels. If the patch is already
@@ -151,4 +155,7 @@ a maintainer tree)
     - tag the patch subject with `ANDROID:`
     - add a `Bug:` tag with the Android bug (required for android-specific features)
 
+<<<<<<< HEAD
 >>>>>>> parent of 6c843d0e8 (README.md aktualisiert)
+=======
+>>>>>>> parent of 65a1eeb07 (remove standard README.md)