Fix #944 merge errors

src/Go/ui/GoGameboardWrapper.tsx

@@ -243,7 +243,7 @@ export function GoGameboardWrapper({ showInstructions }: IProps): React.ReactEle
           <br />
           <Typography variant={"h6"} className={classes.opponentLabel}>
             {opponent !== opponents.none ? "Subnet owner: " : ""}{" "}
-            {opponent === opponents.w0r1d_d43m0n ? <CorruptableText content={opponent} /> : opponent}
+            {opponent === opponents.w0r1d_d43m0n ? <CorruptableText content={opponent} spoiler={false} /> : opponent}
           </Typography>
           <br />
         </Box>

src/Go/ui/GoHistoryPage.tsx

@@ -54,7 +54,11 @@ export const GoHistoryPage = (): React.ReactElement => {
               <Typography>
                 {" "}
                 <strong className={classes.keyText}>
-                  {faction === opponents.w0r1d_d43m0n ? <CorruptableText content="????????????" /> : faction}
+                  {faction === opponents.w0r1d_d43m0n ? (
+                    <CorruptableText content="????????????" spoiler={false} />
+                  ) : (
+                    faction
+                  )}
                 </strong>
               </Typography>
               <Table sx={{ display: "table", mb: 1, width: "100%" }}>

src/Go/ui/GoSubnetSearch.tsx

@@ -73,7 +73,7 @@ export const GoSubnetSearch = ({ open, search, cancel, showInstructions }: IProp
             {opponentFactions.map((faction) => (
               <MenuItem key={faction} value={faction}>
                 {faction === opponents.w0r1d_d43m0n ? (
-                  <CorruptableText content="???????????????" />
+                  <CorruptableText content="???????????????" spoiler={false} />
                 ) : (
                   `${faction} (${opponentDetails[faction].description})`
                 )}
@@ -120,8 +120,8 @@ export const GoSubnetSearch = ({ open, search, cancel, showInstructions }: IProp
           <Typography>
             {opponent === opponents.w0r1d_d43m0n ? (
               <>
-                <CorruptableText content={opponentDetails[opponent].flavorText.slice(0, 40)} />
-                <CorruptableText content={opponentDetails[opponent].flavorText.slice(40)} />
+                <CorruptableText content={opponentDetails[opponent].flavorText.slice(0, 40)} spoiler={false} />
+                <CorruptableText content={opponentDetails[opponent].flavorText.slice(40)} spoiler={false} />
               </>
             ) : (
               opponentDetails[opponent].flavorText