diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
index 0e24aac27c7..9af1a58e893 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ b/addons/hr_recruitment/hr_recruitment_demo.yml
@@ -9,12 +9,8 @@
     stage_id: stage_job1
     name: 'Salesperson'
     partner_phone: '1236547890'
-<<<<<<< TREE
     date_action: !eval time.strftime('%Y-%m-15 18:15:00')
     title_action: 'Send mail regarding our interviwes'
-=======
-    categ_ids: [hr_recruitment.tag_applicant_sales]
->>>>>>> MERGE-SOURCE
 
 -
   !record {model: hr.applicant, id: hr_case_traineemca0}:
@@ -28,12 +24,8 @@
     stage_id: stage_job4
     name: 'Trainee - MCA'
     partner_phone: '6633225'
-<<<<<<< TREE
     date_action: !eval time.strftime('%Y-%m-10 18:15:00')
     title_action: 'Call to define real needs about training<'
-=======
-    categ_ids: [hr_recruitment.tag_applicant_manager]
->>>>>>> MERGE-SOURCE
 -
   !record {model: hr.applicant, id: hr_case_fresher0}:
     date: !eval time.strftime('%Y-%m-15 16:10:00')
@@ -45,12 +37,8 @@
     stage_id: stage_job3
     name: 'Fresher'
     partner_phone: '999666735'
-<<<<<<< TREE
     date_action: !eval time.strftime('%Y-%m-5 18:15:00')
     title_action: 'Send mail regarding our interviwes'
-=======
-    categ_ids: [hr_recruitment.tag_applicant_it]
->>>>>>> MERGE-SOURCE
 -
   !record {model: hr.applicant, id: hr_case_yrsexperienceinphp0}:
     date: !eval time.strftime('%Y-%m-25 16:25:52')
@@ -72,12 +60,8 @@
     color: 5
     stage_id: stage_job5
     name: 'Marketing Job'
-<<<<<<< TREE
     date_action: !eval time.strftime('%Y-%m-20 18:15:00')
     title_action: 'Send mail regarding our interviwes'
-=======
-    categ_ids: [hr_recruitment.tag_applicant_sales]
->>>>>>> MERGE-SOURCE
 -
   !record {model: hr.applicant, id: hr_case_financejob0}:
     date: !eval time.strftime('%Y-%m-26 17:39:42')
@@ -89,12 +73,8 @@
     stage_id: stage_job2
     name: 'Finance Job'
     partner_phone: '33968745'
-<<<<<<< TREE
     date_action: !eval time.strftime('%Y-%m-18 18:15:00')
     title_action: 'Send mail regarding our interviews'
-=======
-    categ_ids: [hr_recruitment.tag_applicant_reserve]
->>>>>>> MERGE-SOURCE
 -
   !record {model: hr.applicant, id: hr_case_traineemca1}:
     date: !eval time.strftime('%Y-%m-12 17:49:19')
@@ -133,12 +113,8 @@
     color: 4
     name: 'Advertisement'
     salary_expected: 11000.0
-<<<<<<< TREE
     date_action: !eval time.strftime('%Y-%m-15 18:15:00')
     title_action: 'Send mail regarding our interviwes'
-=======
-    categ_ids: [hr_recruitment.tag_applicant_reserve]
->>>>>>> MERGE-SOURCE
 -
   !record {model: hr.job, id: hr.job_developer}:
     survey_id: hr_recruitment.survey_job_0