diff --git a/FencerJudgeFront/src/app/components/home/home.component.ts b/FencerJudgeFront/src/app/components/home/home.component.ts
index 76699da..c6a3439 100644
--- a/FencerJudgeFront/src/app/components/home/home.component.ts
+++ b/FencerJudgeFront/src/app/components/home/home.component.ts
@@ -1,8 +1,6 @@
 import { Component } from '@angular/core';
 
 import { MatchesService } from '@services/matches/matches.service';
-<<<<<<< HEAD
-=======
 import { Matches, MatchState } from '@interfaces/matches';
 
 import { PlayerService } from '@services/player/player.service';
@@ -10,7 +8,6 @@ import { Player } from '@interfaces/player';
 
 import { RefereeService } from '@services/referee/referee.service';
 import { Referee, RefereeLevel } from '@interfaces/referee';
->>>>>>> feature/front
 
 @Component({
   selector: 'app-home',
diff --git a/FencerJudgeFront/src/app/services/matches/matches.service.ts b/FencerJudgeFront/src/app/services/matches/matches.service.ts
index f3dcc71..5a80f75 100644
--- a/FencerJudgeFront/src/app/services/matches/matches.service.ts
+++ b/FencerJudgeFront/src/app/services/matches/matches.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Observable, Subject, BehaviorSubject } from 'rxjs';
+import { Observable, Subject, BehaviorSubject, of } from 'rxjs';
 import { Matches, MatchState } from '@interfaces/matches';
 
 @Injectable({ providedIn: 'root' })
@@ -123,7 +123,7 @@ export class MatchesService {
   ngOnDestroy(): void {
     this.socket?.close();
   }
-  
+
   create(match: Omit<Matches, 'id'>): Observable<Matches> {
     const newMatch: Matches = {
       ...match,