Remove merge markers.
Remove merge markers.

cakephp/cakephp,ADmad/cakephp,CakeDC/cakephp,ADmad/cakephp,ndm2/cakephp,cakephp/cakephp,ndm2/cakephp,ADmad/cakephp,CakeDC/cakephp,cakephp/cakephp,CakeDC/cakephp,ndm2/cakephp,ndm2/cakephp,ADmad/cakephp,cakephp/cakephp,CakeDC/cakephp