diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
index f5ad0590e..d892f9368 100644
--- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
+++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
@@ -263,7 +263,6 @@
             <mat-form-field appearance="outline" class="name-field last-name">
               <mat-label>{{ 'labels.inputs.Last Name' | translate }}</mat-label>
               <span matPrefix class="field-prefix-icon"><mat-icon>person</mat-icon></span>
-              <<<<<<< Updated upstream
               <input
                 matInput
                 required
@@ -272,9 +271,6 @@
                 (blur)="capitalizeControl('lastname')"
                 style="text-transform: capitalize"
               />
-              =======
-              <input matInput required formControlName="lastname" autocomplete="off" (input)="formatName('lastname')" />
-              >>>>>>> Stashed changes
               @if (createClientForm.controls.lastname.hasError('required')) {
                 <mat-error>Last name is <strong>required</strong></mat-error>
               } @else if (createClientForm.controls.lastname.hasError('pattern')) {
diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts b/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts
index 8ea5bf5e5..910651bb5 100644
--- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts
+++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts
@@ -2590,28 +2590,6 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
       dormantFlag: 'ACTIVE'
     };
   }
-
-  /**
-   * Automatically capitalizes the first letter of each word and lowercases the rest.
-   * e.g., "sri rAm" -> "Sri Ram"
-   */
-  formatName(controlName: string): void {
-    const control = this.createClientForm.get(controlName);
-    if (!control || typeof control.value !== 'string') return;
-
-    const val = control.value;
-    const formatted = val
-      .split(' ')
-      .map((word: string) => {
-        if (!word) return '';
-        return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
-      })
-      .join(' ');
-
-    if (formatted !== val) {
-      control.setValue(formatted, { emitEvent: false });
-    }
-  }
 }
 
 /**