diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd285ba5f..211d68744 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # How to contribute
 
 CakePHP loves to welcome your contributions. There are several ways to help out: