diff --git a/lib/Cake/Console/TaskCollection.php b/lib/Cake/Console/TaskCollection.php
index d9b8a1325..4a8513890 100644
--- a/lib/Cake/Console/TaskCollection.php
+++ b/lib/Cake/Console/TaskCollection.php
@@ -15,11 +15,9 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-<<<<<<< HEAD:lib/Cake/Console/TaskCollection.php
+
 App::uses('ObjectCollection', 'Utility');
 
-=======
->>>>>>> origin/2.0:cake/console/libs/task_collection.php
 class TaskCollection extends ObjectCollection {
 /**
  * Shell to use to set params to tasks.