diff --git a/src/pong/src/state.ts b/src/pong/src/state.ts
index 67cf8b7..5d94cb9 100644
--- a/src/pong/src/state.ts
+++ b/src/pong/src/state.ts
@@ -223,16 +223,12 @@ class StateI {
 	}
 
 	public newPausedGame(suid1: string, suid2: string): GameId | undefined {
-<<<<<<< HEAD
 		if (
 			!this.users.has(suid1 as UserId) ||
 			!this.users.has(suid2 as UserId)
 		) {
 			return undefined;
 		}
-=======
-
->>>>>>> 78eb546 (Added U Game system)
 		const uid1: UserId = suid1 as UserId;
 		const uid2: UserId = suid2 as UserId;
 		const g = new Pong(uid1, uid2);