diff --git a/Client.java b/Client.java
index d4f0de2..e62141d 100755
--- a/Client.java
+++ b/Client.java
@@ -309,6 +309,7 @@ public class Client {
 			frame.setMinimumSize(frame.getSize());
 			frame.setVisible(true);
 			//userInput = stdIn.readLine();
+<<<<<<< HEAD
 			int gameMode = 0;
 			userInput = JOptionPane.showInputDialog(frame, temp);
 			gameMode = Integer.parseInt(userInput);
@@ -317,11 +318,21 @@ public class Client {
 				output.println(userInput);
 			}
 			gameMode = Integer.parseInt(userInput);
+=======
+			userInput = JOptionPane.showInputDialog(frame, temp);
+			//while(!userInput.contains("1") || !userInput.contains("2")) { 
+			//	userInput = JOptionPane.showInputDialog(frame, temp);
+			//}
+>>>>>>> b517b06bc614e18b2c6252c12fcfdc1eb71fd38f
 			output.println(userInput);
 			
 			String diff = "?";
 			in.read(b, 0, 256);
 			temp = String.valueOf(b).trim();
+<<<<<<< HEAD
+=======
+			//System.out.print(temp);
+>>>>>>> b517b06bc614e18b2c6252c12fcfdc1eb71fd38f
 			while(!diff.equals("EASY") && !diff.equals("MEDIUM") && !diff.equals("HARD")) {
 				diff = JOptionPane.showInputDialog(frame, temp);//diff = stdIn.readLine();
 				diff = diff.toUpperCase();
@@ -331,6 +342,7 @@ public class Client {
 			}
 			output.println(userInput);
 			String out = "";
+<<<<<<< HEAD
 			if(gameMode == 1)
 			{
 				while(!end) {
@@ -361,6 +373,17 @@ public class Client {
 								System.out.println("Invalid move.");
 							}
 						}
+=======
+			
+			while(!end) {
+				char[] buffer = new char[256];
+				in.read(buffer, 0, 256);
+				for(int i = 0; i < buffer.length; ++i) {
+					if(Arrays.equals(Arrays.copyOfRange(buffer, i, i+9), go)) {
+						frame.dispatchEvent(new WindowEvent(frame, WindowEvent.WINDOW_CLOSING));
+						JOptionPane.showMessageDialog(null, "\nGAME OVER\n");
+						end = true;
+>>>>>>> b517b06bc614e18b2c6252c12fcfdc1eb71fd38f
 					}
 					System.out.println(out);
 					output.println(out);
@@ -420,4 +443,4 @@ public class Client {
 			System.err.println("IOException: " + e.getMessage());
 		}
 	}
-}
\ No newline at end of file
+}