Fix text and image overlap in careers page

src/collections/programs/gsoc-2025/index.mdx

@@ -38,6 +38,8 @@ import playground from "./meshery-playground-alt-4.webp";
   </ul>
 </div>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 ## GSoC 2025 Project Ideas
 <br />
 
@@ -59,6 +61,7 @@ import playground from "./meshery-playground-alt-4.webp";
   - Meshery will be able to orchestrate and manage all Azure services supported by ASO. This includes the ability to discover, configure, deploy, and operate the lifecycle of Azure services through Meshery. The Meshery Model generator will be updated to automatically generate models for Azure services, simplifying their integration and management within Meshery. This will be an officially supported feature of Meshery.
 - **Recommended Skills:** Golang, Kubernetes, Azure, well-written and well-spoken English
 - **Mentor(s):** <Link to="/community/members/lee-calcote">Lee Calcote</Link>, <Link to="mailto:mia.grenell2337@gmail.com">Mia Grenell</Link>
+<<<<<<< HEAD
 - **Expected project size:** large (175 hours)
 - **Difficulty:** Hard
 - **Upstream Issue (URL):** https://github.com/meshery/meshery/issues/11244
@@ -73,6 +76,56 @@ import playground from "./meshery-playground-alt-4.webp";
 - **Expected project size:** large (175 hours)
 - **Difficulty:** Hard
 - **Upstream Issue (URL):**  https://github.com/meshery/meshery/issues/13555
+=======
+## GSoC 2024 Project Ideas
+=======
+## GSoC 2025 Project Ideas
+>>>>>>> 1f319413 (update year)
+<br />
+
+#### Multi-player Collaboration: Resilient Websockets and GraphQL Subscriptions
+
+- **Description:** Meshery's current implementation of websockets and GraphQL subscriptions is in need of refactoring for increased reliability and resiliency. This client and server-side refactoring includes use of webworkers and separation of concerns for the client-side, and the use of a message broker for the server-side. The project has implications on Meshery's implementation of multi-player collaboration functionality.
+- **Expected outcome:** 
+  - Resilient websockets and GraphQL subscriptions for Meshery, enabling multi-player collaboration functionality.
+- **Recommended Skills:** Golang, Kubernetes, Azure, well-written and well-spoken English
+- **Mentor(s):** <Link to="/community/members/lee-calcote">Lee Calcote</Link>, <Link to="/community/members/aabid-sofi">Aabid Sofi</Link>
+- **Expected project size:** 175 hours
+- **Difficulty:** Medium
+- **Upstream Issue (URL):** https://github.com/meshery/meshery/issues/13554
+
+#### Support for Azure in Meshery
+
+- **Description:** Enhance Meshery's existing orchestration capabilities to include support for Azure. The <a href="https://azure.github.io/azure-service-operator">Azure Service Operator</a>(ASO) provides a wide variety of Azure Resources via Kubernetes custom resources as first-class <a href="https://docs.meshery.io/concepts/logical/models">Meshery Models</a>. This involves enabling Meshery to manage and orchestrate Azure services and their resources, similar to how it handles other Kubernetes resources. The project will also include generating support for Azure services and their resources in Meshery's Model generator.
+- **Expected outcome:** 
+  - Meshery will be able to orchestrate and manage all Azure services supported by ASO. This includes the ability to discover, configure, deploy, and operate the lifecycle of Azure services through Meshery. The Meshery Model generator will be updated to automatically generate models for Azure services, simplifying their integration and management within Meshery. This will be an officially supported feature of Meshery.
+- **Recommended Skills:** Golang, Kubernetes, Azure, well-written and well-spoken English
+- **Mentor(s):** <Link to="/community/members/lee-calcote">Lee Calcote</Link>, <Link to="mailto:mia.grenell2337@gmail.co">Mia Grenell</Link>
+=======
+>>>>>>> f22b09d5 (Update src/collections/programs/gsoc-2025/index.mdx)
+- **Expected project size:** large (175 hours)
+- **Difficulty:** Hard
+<<<<<<< HEAD
+<<<<<<< HEAD
+- **Upstream Issue (URL):**   https://github.com/meshery/meshery/issues/13514
+>>>>>>> 6ec42010 (gsoc-2025-ideas)
+=======
+- **Upstream Issue (URL):**  https://github.com/meshery/meshery/issues/13514
+>>>>>>> 7e558222 (lfx-2025-term-1)
+=======
+- **Upstream Issue (URL):** https://github.com/meshery/meshery/issues/11244
+
+#### Distributed client-side inference (policy evaluation) with WebAssembly (WASM) and OPA in Meshery
+
+- **Description:** Meshery's highly dynamic infrastructure configuration capabilities require real-time evaluation of complex policies. Policies of various types and with a high number of parameters need to be evaluted client-side. With policies expressed in Rego, the goal of this project is to incorporate use of the <a href="https://github.com/open-policy-agent/golang-opa-wasm">https://github.com/open-policy-agent/golang-opa-wasm</a> project into Meshery UI, so that a powerful, real-time user experience is possible.
+- **Expected outcome:** 
+  - The goal of this project is to enhance Meshery's infrastructure configuration capabilities by incorporating real-time policy evaluation using the golang-opa-wasm project. This project will integrate the capabilities of golang-opa-wasm into the Meshery UI, enabling users to experience the existing, powerful, server-side policy evaluation client-side.
+- **Recommended Skills:** WebAssembly, Golang, Open Policy Agent, well-written and well-spoken English
+- **Mentor(s):** <Link to="/community/members/lee-calcote">Lee Calcote</Link>, <Link to="mailto:james.horton2337@gmail.com">James Horton</Link>
+- **Expected project size:** large (175 hours)
+- **Difficulty:** Hard
+- **Upstream Issue (URL):**  https://github.com/meshery/meshery/issues/13555
+>>>>>>> 7bdc458f (update gsoc 2025 program)
 
 ### Cloud Native Playground
 
@@ -81,6 +134,21 @@ import playground from "./meshery-playground-alt-4.webp";
 </a>
 
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+#### In-browser OPA policy evaluation in WASM and Rego
+
+- **Description:** Meshery's highly dynamic infrastructure configuration capabilities require real-time evaluation of complex policies. Policies of various types and with a high number of parameters need to be evaluted client-side. With policies expressed in Rego, the goal of this project is to incorporate use of the https://github.com/open-policy-agent/golang-opa-wasm project into Meshery UI, so that a powerful, real-time user experience is possible.
+- **Expected outcome:**
+- **Recommended Skills:** Golang, Open Policy Agent, WASM
+- **Mentor(s):** <Link to="/community/members/lee-calcote">Lee Calcote</Link>, <Link to="/community/members/abhishek-kumar">Abhishek Kumar</Link>
+- **Expected project size:** 350 hours
+- **Difficulty:** Hard
+- **Upstream Issue (URL):** https://github.com/meshery/meshery/issues/7019
+>>>>>>> 6ec42010 (gsoc-2025-ideas)
+=======
+>>>>>>> 694da1b9 (Update src/collections/programs/gsoc-2025/index.mdx)
 
 <br />
 <hr />
@@ -142,10 +210,24 @@ We interact daily over Slack, and have an open source project <Link to="/communi
 <div className="apply-button">
   <h3>
     <Button
+<<<<<<< HEAD
+<<<<<<< HEAD
+      $primary
+      title="Participate"
+      $url="https://discuss.layer5.io"
+      $external={ true }
+=======
+      primary
+      title="Participate"
+      url="https://discuss.layer5.io"
+      external={ true }
+>>>>>>> 6ec42010 (gsoc-2025-ideas)
+=======
       $primary
       title="Participate"
       $url="https://discuss.layer5.io"
       $external={ true }
+>>>>>>> 1fbda854 (Fix participate button in gsoc)
     />
   </h3>
 </div>

src/collections/programs/lfx-2025/lfx-2025.mdx

@@ -114,10 +114,24 @@ We interact daily over Slack, and have an open source project [meeting everyday]
 <div className="apply-button">
   <h3>
     <Button
+<<<<<<< HEAD
+<<<<<<< HEAD
       $primary
       title="Participate"
       $url="https://slack.layer5.io"
       $external={ true }
+=======
+      primary
+      title="Participate"
+      url="https://slack.layer5.io"
+      external={ true }
+>>>>>>> 7e558222 (lfx-2025-term-1)
+=======
+      $primary
+      title="Participate"
+      $url="https://slack.layer5.io"
+      $external={ true }
+>>>>>>> 62f12b41 (Fix button in lfx)
     />
   </h3>
 </div>

src/sections/Careers/Careers-Programs-grid/ProgramGrid.style.js

@@ -94,7 +94,7 @@ export const ProgramsPageWrapper = styled.div`
         margin-right: -50vw;
     }
     .opensource-section-text{
-        padding-top: 4rem;
+        padding: 4rem 2.5rem 0;
     }
     .opensource-section-text > h1{
         margin-bottom: 1rem;
@@ -108,6 +108,7 @@ export const ProgramsPageWrapper = styled.div`
     }
     .opensource-section-img{
         margin-top: -8rem;
+        margin-bottom: 10rem;
         position: relative;
         top: 10rem;
     }