diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index abd8ca38bbe..e53fed203d2 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -44,10 +44,7 @@ Features
     "demo_xml": ["project_long_term_demo.xml"],
     "test": [
           'test/phase_process.yml',
-<<<<<<< TREE
           'test/task_process.yml',
-=======
->>>>>>> MERGE-SOURCE
     ],
     "update_xml": [
         "security/ir.model.access.csv",