diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index 07ec7f0..13a6feb 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -2797,15 +2797,8 @@ export class SalaryPeriodController extends Controller {
                 },
               });
               salaryProfileNew.type = salaryOld == null ? 0 : salaryOld.type;
-<<<<<<< HEAD
               salaryProfileNew.salaryLevel = salaryOld && salaryOld.salaryLevelNew ? salaryOld.salaryLevelNew : salaryOld?.salaryLevel;
               salaryProfileNew.group = salaryOld && salaryOld.groupNew ? salaryOld.groupNew : salaryOld?.group;
-=======
-              salaryProfileNew.salaryLevel =
-                salaryOld && salaryOld.salaryLevelNew
-                  ? salaryOld.salaryLevelNew
-                  : salaryOld?.salaryLevel;
->>>>>>> develop
               salaryProfileNew.amount = salaryOld == null ? 0 : salaryOld.amount;
               salaryProfileNew.amountSpecial = salaryOld == null ? 0 : salaryOld.amountSpecial;
               salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse;