diff --git a/static/css/game.css b/static/css/game.css
index 3067124..c60f230 100644
--- a/static/css/game.css
+++ b/static/css/game.css
@@ -19,13 +19,9 @@
     border-right: none;
     border-bottom: none;
     height: min-content;
-<<<<<<< HEAD
     width: 100%;
     min-width: 32rem;
     max-width: 44rem;
-=======
-    min-width: 500px;
->>>>>>> upstream/indev
 }
 
 .header {
diff --git a/static/css/games_page.css b/static/css/games_page.css
index a864937..d8d9e02 100644
--- a/static/css/games_page.css
+++ b/static/css/games_page.css
@@ -8,6 +8,7 @@
 .emptyslot, .game {
     min-height: 18.75rem;
     justify-self: center;
+    max-width: 44rem;
 }
 
 #filters {