realACO · realACO · Mar 12, 2026 · Mar 12, 2026
diff --git a/.gitconfig b/.gitconfig
@@ -1,3 +1,3 @@
 [user]
-	email = e1@emergent.sh
-	name = E1
+	email = 
+	name = 
diff --git a/backend/.env b/backend/.env
diff --git a/backend/requirements.txt b/backend/requirements.txt
diff --git a/frontend/.env b/frontend/.env
@@ -1,2 +1 @@
-REACT_APP_BACKEND_URL=https://42902f61-f81d-4f93-8ed1-4a8abb3a8b3b.preview.emergentagent.com
 WDS_SOCKET_PORT=443
diff --git a/frontend/jsconfig.json b/frontend/jsconfig.json
@@ -4,7 +4,8 @@
     "ignoreDeprecations": "6.0",
     "paths": {
       "@/*": ["src/*"]
-    }
+    },
+    "ignoreDeprecations": "6.0"
   },
   "include": ["src"]
 }
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -1,5 +1,21 @@
-<!doctype html>
+<!doctype html>
 <html lang="en">
+<<<<<<< HEAD
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="GameHub - A collection of classic browser games"
+    />
+    <title>GameHub</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+  </body>
+=======
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -11,4 +27,5 @@
         <noscript>You need to enable JavaScript to run this app.</noscript>
         <div id="root"></div>
     </body>
+>>>>>>> 5ba5d7a24af347ce938db3c693acb141f5a12858
 </html>
diff --git a/frontend/src/games/Checkers.js b/frontend/src/games/Checkers.js
@@ -71,8 +71,15 @@ const Checkers = () => {
         if (!isValidSquare(newRow, newCol)) continue;
 
         if (!boardState[newRow][newCol]) {
+<<<<<<< HEAD
+          // Regular move to empty square
           moves.push({ row: newRow, col: newCol, type: "move" });
         } else if (boardState[newRow][newCol].color !== piece.color) {
+          // Potential capture
+=======
+          moves.push({ row: newRow, col: newCol, type: "move" });
+        } else if (boardState[newRow][newCol].color !== piece.color) {
+>>>>>>> 5ba5d7a24af347ce938db3c693acb141f5a12858
           const jumpRow = newRow + dRow;
           const jumpCol = newCol + dCol;
 
@@ -128,9 +135,13 @@ const Checkers = () => {
     capturedRow = null,
     capturedCol = null,
   ) => {
+<<<<<<< HEAD
+    const newBoard = board.map((row) => [...row]);
+=======
     const newBoard = board.map((row) =>
       row.map((cell) => (cell ? { ...cell } : null)),
     );
+>>>>>>> 5ba5d7a24af347ce938db3c693acb141f5a12858
     const piece = newBoard[fromRow][fromCol];
 
     // Move piece
@@ -173,7 +184,11 @@ const Checkers = () => {
     } else {
       // End turn
       setSelectedSquare(null);
+<<<<<<< HEAD
+      setCurrentPlayer((prev) => (prev === "red" ? "black" : "red"));
+=======
       setCurrentPlayer(currentPlayer === "red" ? "black" : "red");
+>>>>>>> 5ba5d7a24af347ce938db3c693acb141f5a12858
       setMustCapture(false);
 
       // Check for win conditions
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		REACT_APP_BACKEND_URL=https://42902f61-f81d-4f93-8ed1-4a8abb3a8b3b.preview.emergentagent.com
		WDS_SOCKET_PORT=443