diff --git a/Client/package-lock.json b/Client/package-lock.json
index 26b303991..c33093918 100644
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
@@ -1424,15 +1424,9 @@
       }
     },
     "node_modules/@mui/x-charts": {
-<<<<<<< HEAD
       "version": "7.6.1",
       "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.6.1.tgz",
       "integrity": "sha512-LuAVQX4lzhmsqk2NRdWCP+aQZ8kRwG7KOy8ulf8hR5NI5J1VsiOtH41J+qgV3uAC6hDMWL7fTgffrRDFTMci/g==",
-=======
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.6.2.tgz",
-      "integrity": "sha512-oG22NRno1+HSLV/9jVLThnHAKN4g+MXOO6GqaQxN9LM0hjt1tgRsrNAlfcJndmj/dVwqFtynkFB5qWnTEBZs7Q==",
->>>>>>> 3f41db916efdd46069589e91f5886a4a01d11896
       "dependencies": {
         "@babel/runtime": "^7.24.6",
         "@mui/base": "^5.0.0-beta.40",
@@ -2436,15 +2430,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-<<<<<<< HEAD
       "version": "1.0.30001628",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001628.tgz",
       "integrity": "sha512-S3BnR4Kh26TBxbi5t5kpbcUlLJb9lhtDXISDPwOfI+JoC+ik0QksvkZtUVyikw3hjnkgkMPSJ8oIM9yMm9vflA==",
-=======
-      "version": "1.0.30001629",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz",
-      "integrity": "sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw==",
->>>>>>> 3f41db916efdd46069589e91f5886a4a01d11896
       "dev": true,
       "funding": [
         {
@@ -2848,15 +2836,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-<<<<<<< HEAD
       "version": "1.4.790",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.790.tgz",
       "integrity": "sha512-eVGeQxpaBYbomDBa/Mehrs28MdvCXfJmEFzaMFsv8jH/MJDLIylJN81eTJ5kvx7B7p18OiPK0BkC06lydEy63A==",
-=======
-      "version": "1.4.792",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.792.tgz",
-      "integrity": "sha512-rkg5/N3L+Y844JyfgPUyuKK0Hk0efo3JNxUDKvz3HgP6EmN4rNGhr2D8boLsfTV/hGo7ZGAL8djw+jlg99zQyA==",
->>>>>>> 3f41db916efdd46069589e91f5886a4a01d11896
       "dev": true
     },
     "node_modules/error-ex": {
diff --git a/Client/src/Components/Integrations/index.jsx b/Client/src/Components/Integrations/index.jsx
index b0e00bdfe..7d7ae96c4 100644
--- a/Client/src/Components/Integrations/index.jsx
+++ b/Client/src/Components/Integrations/index.jsx
@@ -5,7 +5,7 @@ import Button from '../Button';
  * Integrations component
  * @returns {JSX.Element}
  */
-const Integrations = () => {
+const IntegrationsComponent = () => {
   const theme = useTheme();
 
   return (
@@ -53,4 +53,4 @@ const Integrations = () => {
   );
 };
 
-export default Integrations;
+export default IntegrationsComponent;
diff --git a/Client/src/Pages/Integrations/index.jsx b/Client/src/Pages/Integrations/index.jsx
index 1df87ee52..ca90e79ef 100644
--- a/Client/src/Pages/Integrations/index.jsx
+++ b/Client/src/Pages/Integrations/index.jsx
@@ -1,9 +1,40 @@
-import React from 'react'
+import IntegrationsComponent from '../../Components/Integrations';
+import { Box, Typography, useTheme } from '@mui/material';
 
+/**
+ * Integrations Page Component
+ * @returns {JSX.Element}
+ */
 const Integrations = () => {
+    const theme = useTheme();
+  
     return (
-        <div>Integrations</div>
-    )
-}
-
-export default Integrations
\ No newline at end of file
+      <Box 
+        display="flex"
+        flexDirection="column"
+        alignItems="flex-start"
+        justifyContent="flex-start"
+        height="100vh"
+        p={theme.spacing(4)}
+        mt={theme.spacing(8)} 
+      >
+        <Typography variant="h4" component="h1" gutterBottom>
+          Integrations
+        </Typography>
+        <Typography variant="h6" component="h2" gutterBottom>
+          Connect Uptime Genie to your favorite service
+        </Typography>
+        <Box 
+          display="flex" 
+          flexWrap="wrap" 
+          gap={theme.spacing(4)}
+        >
+          <IntegrationsComponent />
+          <IntegrationsComponent />
+          <IntegrationsComponent />
+        </Box>
+      </Box>
+    );
+  };
+  
+  export default Integrations;