diff --git a/banquise-website/src/App.tsx b/banquise-website/src/App.tsx
index 4c7f5d2..b7c4643 100644
--- a/banquise-website/src/App.tsx
+++ b/banquise-website/src/App.tsx
@@ -6,15 +6,15 @@ import { TechFeaturesSection } from './components/sections/TechFeaturesSection';
 import { ServicesSection } from './components/sections/ServicesSection';
 import { AboutSection } from './components/sections/AboutSection';
 import { Popup } from './components/ui/Popup';
-import icebergImage from './assets/iceberg.png';
 
+// Define Service interface directly in App
 interface Service {
   name: string;
   url: string;
   image: string;
-  icon: string;
   description: string;
   features: string[];
+  icon: string;
 }
 
 const App: React.FC = () => {
@@ -22,13 +22,8 @@ const App: React.FC = () => {
   const services: Service[] = [
     { 
       name: "Wiki", 
-<<<<<<< Updated upstream
-      url: "https://wiki.labanquise.org", 
-      image: "/src/assets/iceberg.png",
-=======
       url: "https://wiki.la-banquise.fr", 
-      image: icebergImage,
->>>>>>> Stashed changes
+      image: "/src/assets/iceberg.png",
       icon: "📚",
       description: "Notre wiki collaboratif est votre centre de documentation technique. Accédez à des guides détaillés, des tutoriels et de la documentation API pour tous nos services.",
       features: [
@@ -42,13 +37,8 @@ const App: React.FC = () => {
     },
     { 
       name: "Gitea", 
-<<<<<<< Updated upstream
-      url: "https://git.labanquise.org", 
-      image: "/src/assets/iceberg.png",
-=======
       url: "https://git.la-banquise.fr", 
-      image: icebergImage,
->>>>>>> Stashed changes
+      image: "/src/assets/iceberg.png",
       icon: "🔧",
       description: "Instance Gitea auto-hébergée pour la gestion de vos dépôts Git. Collaborez sur vos projets avec un contrôle total sur votre code source.",
       features: [
@@ -62,13 +52,8 @@ const App: React.FC = () => {
     },
     { 
       name: "Panel", 
-<<<<<<< Updated upstream
-      url: "https://panel.labanquise.org", 
-      image: "/src/assets/iceberg.png",
-=======
       url: "https://panel.la-banquise.fr", 
-      image: icebergImage,
->>>>>>> Stashed changes
+      image: "/src/assets/iceberg.png",
       icon: "🎮",
       description: "Interface de gestion centralisée pour vos serveurs de jeux. Déployez, configurez et surveillez vos serveurs gaming en quelques clics.",
       features: [
diff --git a/banquise-website/src/components/layout/Navigation.tsx b/banquise-website/src/components/layout/Navigation.tsx
index 3c9cf94..ed0fd67 100644
--- a/banquise-website/src/components/layout/Navigation.tsx
+++ b/banquise-website/src/components/layout/Navigation.tsx
@@ -1,9 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { MobileMenu } from './MobileMenu';
-<<<<<<< Updated upstream
-=======
-import banquiseServer from '../../assets/banquise_server.svg'
->>>>>>> Stashed changes
+import banquiseServer from '/src/assets/banquise_server.svg'
 
 export const Navigation: React.FC = () => {
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
@@ -47,7 +44,7 @@ export const Navigation: React.FC = () => {
               <div className="relative">
                 <div className="absolute inset-0 bg-gradient-to-r from-banquise-blue-light/20 to-banquise-blue/20 rounded-full blur-lg opacity-0 group-hover:opacity-100 transition-opacity duration-300"></div>
                 <img 
-                  src="/src/assets/banquise.png" 
+                  src={banquiseServer}
                   alt="Logo La Banquise" 
                   className="h-10 sm:h-12 lg:h-14 w-auto relative z-10 transition-transform duration-300 group-hover:scale-110" 
                   style={{ filter: 'drop-shadow(0 0 12px rgba(168, 218, 255, 0.4))' }} 
@@ -93,7 +90,7 @@ export const Navigation: React.FC = () => {
                 <div className="absolute inset-0 bg-gradient-to-r from-indigo-500 to-purple-500 opacity-0 group-hover:opacity-100 transition-opacity duration-300"></div>
                 <div className="relative z-10 flex items-center space-x-2">
                   <svg className="w-4 h-4 lg:w-5 lg:h-5" fill="currentColor" viewBox="0 0 24 24">
-                    <path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.211.375-.445.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.68 15.347c-1.182 0-2.157-.982-2.157-2.185 0-1.204.956-2.186 2.157-2.186 1.201 0 2.175.982 2.157 2.186 0 1.203-.956 2.185-2.157 2.185zm6.64 0c-1.182 0-2.157-.982-2.157-2.185 0-1.204.955-2.186 2.157-2.186 1.201 0 2.175.982 2.157 2.186 0 1.203-.956 2.185-2.157 2.185z"/>
+                    <path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.211.375-.445.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03z"/>
                   </svg>
                   <span>Discord</span>
                 </div>
diff --git a/banquise-website/src/components/sections/AboutSection.tsx b/banquise-website/src/components/sections/AboutSection.tsx
index 36ae0f6..86e2bc1 100644
--- a/banquise-website/src/components/sections/AboutSection.tsx
+++ b/banquise-website/src/components/sections/AboutSection.tsx
@@ -34,7 +34,8 @@ export const AboutSection: React.FC<AboutSectionProps> = ({ openAccordion, toggl
         >
           <div className="space-y-4">
             <p className="text-banquise-gray/90 leading-relaxed">
-              Fournir une plateforme stable et accessible pour héberger vos projets, partager vos connaissances et jouer ensemble.
+              Former les étudiants au déploiment et a la gestion d'une infra, et de maitriser des technologies entreprise grade.
+              Cela permet de fournir une plateforme stable et accessible pour héberger vos projets, partager vos connaissances et jouer ensemble !
             </p>
             <p className="text-banquise-gray/90 leading-relaxed">
               Nous croyons en la puissance de la collaboration et mettons à disposition des outils modernes pour faciliter le travail en équipe.
diff --git a/banquise-website/src/components/sections/HeroSection.tsx b/banquise-website/src/components/sections/HeroSection.tsx
index bb49a51..d9e5893 100644
--- a/banquise-website/src/components/sections/HeroSection.tsx
+++ b/banquise-website/src/components/sections/HeroSection.tsx
@@ -1,13 +1,10 @@
 import React from 'react';
-<<<<<<< Updated upstream
-=======
-import banquiseServer from '../../assets/banquise_server.svg'
->>>>>>> Stashed changes
+import banquiseServer from '/src/assets/banquise_server.svg'
 
 export const HeroSection: React.FC = () => (
   <section className="min-h-[calc(80vh-72px)] flex flex-col justify-center items-center text-center py-12 sm:py-16 md:py-20 w-full max-w-6xl mx-auto px-4 sm:px-6 md:px-8 relative z-3">
     <div className="mb-8 sm:mb-10 md:mb-12 w-32 h-32 sm:w-40 sm:h-40 md:w-48 md:h-48 rounded-full bg-gradient-to-br from-banquise-blue-dark/20 to-banquise-blue/10 p-4 sm:p-5 md:p-6 shadow-2xl animate-gentle-float backdrop-blur-sm border border-banquise-blue-lightest/30">
-      <img src="/src/assets/banquise.png" alt="Logo La Banquise" className="w-full h-full object-contain" style={{ filter: 'drop-shadow(0 10px 25px rgba(31, 93, 137, 0.3))' }} />
+      <img src={banquiseServer} alt="Logo La Banquise" className="w-full h-full object-contain" style={{ filter: 'drop-shadow(0 10px 25px rgba(31, 93, 137, 0.3))' }} />
     </div>
     
     <h1 className="text-banquise-gray text-3xl sm:text-4xl md:text-5xl lg:text-6xl mb-6 sm:mb-7 md:mb-8 font-extrabold leading-tight max-w-4xl font-heading px-2" style={{ textShadow: '0 2px 10px rgba(0, 0, 0, 0.3)' }}>