diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
index 1eae66326a751bbc2a235d6f84b6d70710857f78..f8957b927143fec1ab65ce318b5f82a301fcea95 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
@@ -39,12 +39,9 @@
           <span *ngIf="lang.lang == 'spacyfrage'">spacy keyword</span>
         </mat-option>
       </mat-select-->
-<<<<<<< HEAD
       <!-- <mat-form-field>
-=======
     <div>
       <mat-form-field>
->>>>>>> added panel fir adding new bad word to the list
         <mat-label>key wählen</mat-label>
         <mat-select [(ngModel)]="selectedLang">
           <mat-option *ngFor="let team of commentLang" [value]="team.lang">