diff --git a/server/routers/newt/handleGetConfigMessage.ts b/server/routers/newt/handleGetConfigMessage.ts
index 23d95b61e..fced51818 100644
--- a/server/routers/newt/handleGetConfigMessage.ts
+++ b/server/routers/newt/handleGetConfigMessage.ts
@@ -9,17 +9,6 @@ import { buildClientConfigurationForNewtClient } from "./buildConfiguration";
 import { convertTargetsIfNessicary } from "../client/targets";
 import { canCompress } from "@server/lib/clientVersionChecks";
 
-<<<<<<< HEAD
-const inputSchema = z.object({
-    publicKey: z.string(),
-    port: z.int().positive(),
-    chainId: z.string()
-});
-
-type Input = z.infer<typeof inputSchema>;
-
-=======
->>>>>>> main
 export const handleGetConfigMessage: MessageHandler = async (context) => {
     const { message, client, sendToClient } = context;
     const newt = client as Newt;
@@ -38,20 +27,7 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
         return;
     }
 
-<<<<<<< HEAD
-    const parsed = inputSchema.safeParse(message.data);
-    if (!parsed.success) {
-        logger.error(
-            "handleGetConfigMessage: Invalid input: " +
-                fromError(parsed.error).toString()
-        );
-        return;
-    }
-
-    const { publicKey, port, chainId } = message.data as Input;
-=======
     const { publicKey, port, chainId } = message.data;
->>>>>>> main
     const siteId = newt.siteId;
 
     // Get the current site data