diff --git a/src/components/Services.jsx b/src/components/Services.jsx
index 2449cf1..c52f748 100644
--- a/src/components/Services.jsx
+++ b/src/components/Services.jsx
@@ -2,10 +2,12 @@ import React from "react";
 import "../scss/components/_services.scss";
 import ServiceCard from "../components/ServicesCard.jsx";
 import { FaYoutube } from "react-icons/fa";
+import battlesnakeLogo from "../../public/images/battlesnake.png";
+import bytecampLogo from "../../public/images/bytecamp.png";
 
-// Using URL references for public assets instead of direct imports
-const battlesnakeLogo = "/images/battlesnake.png";
-const bytecampLogo = "/images/bytecamp.png";
+// // Using URL references for public assets instead of direct imports
+// const battlesnakeLogo = "/images/battlesnake.png";
+// const bytecampLogo = "/images/bytecamp.png";
 
 function Services() {
   return (
diff --git a/src/pages/SignUp.jsx b/src/pages/SignUp.jsx
index 70b8edf..655e4eb 100644
--- a/src/pages/SignUp.jsx
+++ b/src/pages/SignUp.jsx
@@ -32,12 +32,7 @@ function SignUpForm() {
   };
 
   const googleAuth = () => {
-<<<<<<< HEAD
-    window.open(authUrl, "_self");
-=======
-    
     window.open(`${authUrl}/auth/google`, "_self");
->>>>>>> refs/remotes/origin/homepage-2nd-sprint
   };
 
   return (