diff --git a/frontend/src/app/modules/dashboard/dashboard-routing.module.ts b/frontend/src/app/modules/dashboard/dashboard-routing.module.ts
index a09d70c..83710fc 100644
--- a/frontend/src/app/modules/dashboard/dashboard-routing.module.ts
+++ b/frontend/src/app/modules/dashboard/dashboard-routing.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { SettingsModule } from './settings/settings.module';
 import { DashboardComponent } from './dashboard.component';
-// import { SettingsComponent } from './pages/settings/settings.component';
 
 
 const routes: Routes = [
diff --git a/frontend/src/app/modules/dashboard/settings/pages/jours-feries/jours-feries.component.ts b/frontend/src/app/modules/dashboard/settings/pages/jours-feries/jours-feries.component.ts
index a346524..30af9cc 100644
--- a/frontend/src/app/modules/dashboard/settings/pages/jours-feries/jours-feries.component.ts
+++ b/frontend/src/app/modules/dashboard/settings/pages/jours-feries/jours-feries.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit ,OnChanges, OnDestroy, TemplateRef, forwardRef } from '@angular/core';
 import { CommonModule, DatePipe } from '@angular/common';
 import { Subject } from 'rxjs';
-import { MonthViewDay, EventColor } from 'calendar-utils';
+import { EventColor } from 'calendar-utils';
 import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { startOfDay, subDays, addDays, endOfMonth, isSameMonth, isSameDay, addHours, endOfDay } from 'date-fns';
+import { startOfDay,  isSameMonth, isSameDay, endOfDay } from 'date-fns';
 import {CalendarCommonModule, CalendarDayModule, CalendarMonthModule, CalendarWeekModule, CalendarEvent, CalendarEventAction, CalendarEventTimesChangedEvent, CalendarView } from 'angular-calendar';
 import { CalendarUtils } from 'angular-calendar';
 import { ChangeDetectionStrategy } from '@angular/core';
diff --git a/frontend/src/app/modules/dashboard/traitement/pages/cheque/cheque.component.html b/frontend/src/app/modules/dashboard/traitement/pages/cheque/cheque.component.html
index 8995d0b..f1d6b11 100644
--- a/frontend/src/app/modules/dashboard/traitement/pages/cheque/cheque.component.html
+++ b/frontend/src/app/modules/dashboard/traitement/pages/cheque/cheque.component.html
@@ -60,7 +60,4 @@ <h2 class="mb-4 border-b-2 border-gray-200 py-2 text-2xl font-bold dark:border-g
     <ng-template matStepperIcon="chat">
         <mat-icon aria-hidden="false" aria-label="Example home icon" fontIcon="home"></mat-icon>
     </ng-template>
-  </mat-stepper>
-  
-
-  <!-- <div class="card flex justify-content-center"></div> -->
+  </mat-stepper>
\ No newline at end of file
diff --git a/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.html b/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.html
index 3724902..49ed434 100644
--- a/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.html
+++ b/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.html
@@ -1,57 +1 @@
-<<<<<<< HEAD
-<ng-container [ngSwitch]="stepperOrientation | async">
-    <div *ngSwitchCase="'horizontal'">Make your screen smaller to see a vertical stepper</div>
-    <div *ngSwitchCase="'vertical'">Make your screen larger to see a horizontal stepper</div>
-  </ng-container>
-  
-  <mat-stepper
-    class="example-stepper"
-    [orientation]="(stepperOrientation | async)!">
-    <mat-step [stepControl]="firstFormGroup" label="Fill out your name">
-      <form [formGroup]="firstFormGroup">
-        <mat-form-field>
-          <mat-label>Name</mat-label>
-          <input matInput placeholder="Last name, First name" formControlName="firstCtrl" required>
-        </mat-form-field>
-        <div>
-          <button mat-button matStepperNext>Next</button>
-        </div>
-      </form>
-    </mat-step>
-    <mat-step [stepControl]="secondFormGroup" label="Fill out your address">
-      <form [formGroup]="secondFormGroup">
-        <mat-form-field>
-          <mat-label>Address</mat-label>
-          <input matInput formControlName="secondCtrl" placeholder="Ex. 1 Main St, New York, NY"
-                 required>
-        </mat-form-field>
-        <div>
-          <button mat-button matStepperPrevious>Back</button>
-          <button mat-button matStepperNext>Next</button>
-        </div>
-      </form>
-    </mat-step>
-    <mat-step [stepControl]="thirdFormGroup" label="Fill out your phone number">
-      <form [formGroup]="thirdFormGroup">
-        <mat-form-field>
-          <mat-label>Phone number</mat-label>
-          <input matInput formControlName="thirdCtrl" placeholder="Ex. 12345678" required>
-        </mat-form-field>
-        <div>
-          <button mat-button matStepperPrevious>Back</button>
-          <button mat-button matStepperNext>Next</button>
-        </div>
-      </form>
-    </mat-step>
-    <mat-step>
-      <ng-template matStepLabel>Done</ng-template>
-      <p>You are now done.</p>
-      <div>
-        <button mat-button matStepperPrevious>Back</button>
-      </div>
-    </mat-step>
-  </mat-stepper>
-  
-=======
-<p>effet works!</p>
->>>>>>> c14521bd719b24ef9bc1f001afce66bc65cbe1b4
+<p>effet works!</p>
\ No newline at end of file
diff --git a/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.ts b/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.ts
index 75dbce6..2081fa2 100644
--- a/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.ts
+++ b/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.ts
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import {Component} from '@angular/core';
 import {FormBuilder, Validators, FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreakpointObserver} from '@angular/cdk/layout';
@@ -43,14 +42,4 @@ export class EffetComponent {
       .observe('(min-width: 800px)')
       .pipe(map(({matches}) => (matches ? 'horizontal' : 'vertical')));
   }
-=======
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-effet',
-  templateUrl: './effet.component.html'
-})
-export class EffetComponent {
-
->>>>>>> c14521bd719b24ef9bc1f001afce66bc65cbe1b4
-}
+}
\ No newline at end of file
diff --git a/frontend/src/app/modules/dashboard/traitement/traitement.module.ts b/frontend/src/app/modules/dashboard/traitement/traitement.module.ts
index 95aa457..e50048c 100644
--- a/frontend/src/app/modules/dashboard/traitement/traitement.module.ts
+++ b/frontend/src/app/modules/dashboard/traitement/traitement.module.ts
@@ -2,10 +2,6 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { TraitementRoutingModule } from './traitement-routing.module';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
-import { ChequeComponent } from './pages/cheque/cheque.component';
-import { EffetComponent } from './pages/effet/effet.component';
-
-
 @NgModule({
     imports: [
         HttpClientModule,
@@ -13,10 +9,6 @@ import { EffetComponent } from './pages/effet/effet.component';
         TraitementRoutingModule
 
     ],
-    declarations: [
-    ChequeComponent,
-    EffetComponent
-  ]
-
+    declarations: []
 })
 export class TraitementModule { }