diff --git a/src/app/components/bingoitem.tsx b/src/app/components/bingoitem.tsx
index cca8e48..5eb4eda 100644
--- a/src/app/components/bingoitem.tsx
+++ b/src/app/components/bingoitem.tsx
@@ -9,10 +9,6 @@ export default function BingoItem({text}: Props){
 	const [clicked, setClicked] = React.useState(false);
 
 	return(
-<<<<<<< HEAD
-		<td><a className={clsx("btn btn-xs sm:btn-sm md:btn-md w-full", {"btn-ghost":(!clicked)}, {"btn-accent":clicked})} onClick={() => setClicked(!clicked)}>{text}</a></td>
-=======
 		<td><a className={clsx("btn btn-xs w-full overflow-hidden", {"btn-ghost":(!clicked)}, {"btn-accent":clicked})} onClick={() => setClicked(!clicked)}>{text}</a></td>
->>>>>>> c0e15bc (feat: Improved layout on mobile devices)
 	);
 }