diff --git a/target/classes/com/cse3310/Lobby.class b/target/classes/com/cse3310/Lobby.class
new file mode 100644
index 0000000..263b3cf
Binary files /dev/null and b/target/classes/com/cse3310/Lobby.class differ
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 4094f38..bf14e3f 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,4 +1,9 @@
 #Created by Apache Maven 3.9.6
+<<<<<<< HEAD
 groupId=com.cse3310_sp24_group26
 artifactId=cse3310
+=======
+artifactId=cse3310
+groupId=com.cse3310_sp24_group26
+>>>>>>> e3ba964bf9f9634a89706b83f6b12ab2e615acab
 version=wordsearch
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index c678920..57c3df4 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,9 +1,18 @@
 com/cse3310/Locations.class
+<<<<<<< HEAD
 com/cse3310/Coordinate.class
 com/cse3310/ServerEvent.class
 com/cse3310/HttpServer.class
 com/cse3310/HttpServer$1.class
 com/cse3310/UserEvent.class
+=======
+com/cse3310/ServerEvent.class
+com/cse3310/Coordinate.class
+com/cse3310/HttpServer.class
+com/cse3310/HttpServer$1.class
+com/cse3310/UserEvent.class
+com/cse3310/Lobby.class
+>>>>>>> e3ba964bf9f9634a89706b83f6b12ab2e615acab
 com/cse3310/User.class
 com/cse3310/App.class
 com/cse3310/Game.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 87baed1..1ed4d2f 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/Game.java
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/HttpServer.java
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/Coordinate.java
@@ -6,3 +7,14 @@
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/UserEvent.java
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/Locations.java
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/App.java
+=======
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/main/java/com/cse3310/UserEvent.java
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/main/java/com/cse3310/Game.java
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/main/java/com/cse3310/Coordinate.java
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/main/java/com/cse3310/App.java
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/main/java/com/cse3310/ServerEvent.java
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/main/java/com/cse3310/HttpServer.java
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/main/java/com/cse3310/Lobby.java
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/main/java/com/cse3310/Locations.java
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/main/java/com/cse3310/User.java
+>>>>>>> e3ba964bf9f9634a89706b83f6b12ab2e615acab
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
index ddf09ab..e61dd7f 100644
--- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -1 +1,5 @@
+<<<<<<< HEAD
 /workspaces/cse3310_sp24_group_26/src/test/java/com/cse3310/AppTest.java
+=======
+/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/src/test/java/com/cse3310/AppTest.java
+>>>>>>> e3ba964bf9f9634a89706b83f6b12ab2e615acab
diff --git a/target/surefire-reports/TEST-com.cse3310.AppTest.xml b/target/surefire-reports/TEST-com.cse3310.AppTest.xml
index ca9aaea..b7071f6 100644
--- a/target/surefire-reports/TEST-com.cse3310.AppTest.xml
+++ b/target/surefire-reports/TEST-com.cse3310.AppTest.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<<<<<<< HEAD
 <testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.073" tests="1" errors="0" skipped="0" failures="0">
   <properties>
     <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
@@ -57,4 +58,65 @@
     <property name="java.class.version" value="55.0"/>
   </properties>
   <testcase name="shouldAnswerWithTrue" classname="com.cse3310.AppTest" time="0.015"/>
+=======
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.017" tests="1" errors="0" skipped="0" failures="0">
+  <properties>
+    <property name="java.specification.version" value="21"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.class.path" value="/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/target/test-classes:/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/target/classes:/Users/whitonnguyen/.m2/repository/junit/junit/4.13.1/junit-4.13.1.jar:/Users/whitonnguyen/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/Users/whitonnguyen/.m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar:/Users/whitonnguyen/.m2/repository/net/freeutils/jlhttp/2.6/jlhttp-2.6.jar:/Users/whitonnguyen/.m2/repository/org/java-websocket/Java-WebSocket/1.5.4/Java-WebSocket-1.5.4.jar:/Users/whitonnguyen/.m2/repository/org/slf4j/slf4j-api/2.0.6/slf4j-api-2.0.6.jar:"/>
+    <property name="java.vm.vendor" value="Oracle Corporation"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="java.vendor.url" value="https://java.oracle.com/"/>
+    <property name="os.name" value="Mac OS X"/>
+    <property name="java.vm.specification.version" value="21"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="US"/>
+    <property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/jdk-21.jdk/Contents/Home/lib"/>
+    <property name="sun.java.command" value="/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/target/surefire/surefirebooter14373831936636754993.jar /Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/target/surefire 2024-04-17T22-37-43_480-jvmRun1 surefire7537711436477338763tmp surefire_015788036884555636456tmp"/>
+    <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/target/test-classes:/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/target/classes:/Users/whitonnguyen/.m2/repository/junit/junit/4.13.1/junit-4.13.1.jar:/Users/whitonnguyen/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/Users/whitonnguyen/.m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar:/Users/whitonnguyen/.m2/repository/net/freeutils/jlhttp/2.6/jlhttp-2.6.jar:/Users/whitonnguyen/.m2/repository/org/java-websocket/Java-WebSocket/1.5.4/Java-WebSocket-1.5.4.jar:/Users/whitonnguyen/.m2/repository/org/slf4j/slf4j-api/2.0.6/slf4j-api-2.0.6.jar:"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="/Users/whitonnguyen"/>
+    <property name="user.language" value="en"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2024-01-16"/>
+    <property name="java.home" value="/Library/Java/JavaVirtualMachines/jdk-21.jdk/Contents/Home"/>
+    <property name="file.separator" value="/"/>
+    <property name="basedir" value="/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="apple.awt.application.name" value="ForkedBooter"/>
+    <property name="surefire.real.class.path" value="/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26/target/surefire/surefirebooter14373831936636754993.jar"/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="java.runtime.version" value="21.0.2+13-LTS-58"/>
+    <property name="user.name" value="whitonnguyen"/>
+    <property name="stdout.encoding" value="UTF-8"/>
+    <property name="path.separator" value=":"/>
+    <property name="os.version" value="13.5"/>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
+    <property name="localRepository" value="/Users/whitonnguyen/.m2/repository"/>
+    <property name="java.vendor.url.bug" value="https://bugreport.java.com/bugreport/"/>
+    <property name="java.io.tmpdir" value="/var/folders/2b/sm5ydr1x5vl4jkb29c33qhr80000gn/T/"/>
+    <property name="java.version" value="21.0.2"/>
+    <property name="user.dir" value="/Users/whitonnguyen/cse3310_sp24_group_26/cse3310_sp24_group_26"/>
+    <property name="os.arch" value="aarch64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="native.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/Users/whitonnguyen/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="UTF-8"/>
+    <property name="java.vendor" value="Oracle Corporation"/>
+    <property name="java.vm.version" value="21.0.2+13-LTS-58"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeBig"/>
+    <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="java.class.version" value="65.0"/>
+  </properties>
+  <testcase name="shouldAnswerWithTrue" classname="com.cse3310.AppTest" time="0.002"/>
+>>>>>>> e3ba964bf9f9634a89706b83f6b12ab2e615acab
 </testsuite>
\ No newline at end of file
diff --git a/target/surefire-reports/com.cse3310.AppTest.txt b/target/surefire-reports/com.cse3310.AppTest.txt
index 27d832b..2f27941 100644
--- a/target/surefire-reports/com.cse3310.AppTest.txt
+++ b/target/surefire-reports/com.cse3310.AppTest.txt
@@ -1,4 +1,8 @@
 -------------------------------------------------------------------------------
 Test set: com.cse3310.AppTest
 -------------------------------------------------------------------------------
+<<<<<<< HEAD
 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.073 s - in com.cse3310.AppTest
+=======
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 s - in com.cse3310.AppTest
+>>>>>>> e3ba964bf9f9634a89706b83f6b12ab2e615acab