@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# How to contribute
CakePHP loves to welcome your contributions. There are several ways to help out: