diff --git a/assets/css/admin.css b/assets/css/admin.css
index 55ce87a..1253f75 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -404,7 +404,6 @@ a.statut:visited {
     line-height: 1;
 }
 
-<<<<<<< HEAD
 /* ====================================
    TIMELINE VERTICALE - DASHBOARD
    ==================================== */
@@ -513,208 +512,6 @@ a.statut:visited {
 
 .step-card .step-note {
     margin-top: 12px;
-=======
-/* Styles pour le dashboard et le setup guidé */
-.esi-peppol-dashboard-wrap {
-    max-width: 1200px;
-}
-
-.esi-peppol-dashboard-intro {
-    font-size: 15px;
-    color: #50575e;
-    margin-bottom: 30px;
-}
-
-.esi-peppol-setup-guide {
-    background: #ffffff;
-    border-radius: 12px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
-    padding: 32px;
-    margin: 30px 0;
-}
-
-.esi-peppol-setup-title {
-    margin: 0 0 32px 0;
-    font-size: 24px;
-    font-weight: 600;
-    color: #1d2327;
-    border-bottom: 2px solid #f0f0f1;
-    padding-bottom: 16px;
-}
-
-.esi-peppol-setup-step {
-    margin-bottom: 24px;
-    padding: 24px;
-    background: #f9f9f9;
-    border-radius: 8px;
-    border-left: 4px solid #c3c4c7;
-    transition: all 0.3s ease;
-}
-
-.esi-peppol-setup-step:last-child {
-    margin-bottom: 0;
-}
-
-.esi-peppol-setup-step.completed {
-    background: #f0f9f4;
-    border-left-color: #10b981;
-}
-
-.esi-peppol-setup-step.pending {
-    background: #fffbf0;
-    border-left-color: #f59e0b;
-}
-
-.esi-peppol-setup-step.esi-peppol-step-no-check {
-    background: #f0f6ff;
-    border-left-color: #3b82f6;
-}
-
-.esi-peppol-setup-step.esi-peppol-step-optional {
-    background: #f8f9fa;
-    border-left-color: #9ca3af;
-    opacity: 0.9;
-}
-
-.esi-peppol-step-header {
-    display: flex;
-    align-items: flex-start;
-    gap: 20px;
-}
-
-.esi-peppol-step-number {
-    flex-shrink: 0;
-    width: 48px;
-    height: 48px;
-    border-radius: 50%;
-    background: #ffffff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 20px;
-    font-weight: 600;
-    color: #50575e;
-    border: 3px solid #c3c4c7;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.esi-peppol-setup-step.completed .esi-peppol-step-number {
-    background: #10b981;
-    border-color: #10b981;
-    color: #ffffff;
-}
-
-.esi-peppol-setup-step.pending .esi-peppol-step-number {
-    background: #ffffff;
-    border-color: #f59e0b;
-    color: #f59e0b;
-}
-
-.esi-peppol-setup-step.esi-peppol-step-no-check .esi-peppol-step-number {
-    background: #ffffff;
-    border-color: #3b82f6;
-    color: #3b82f6;
-}
-
-.esi-peppol-setup-step.esi-peppol-step-optional .esi-peppol-step-number {
-    background: #ffffff;
-    border-color: #9ca3af;
-    color: #9ca3af;
-}
-
-.esi-peppol-check-icon {
-    font-size: 28px;
-    line-height: 1;
-    font-weight: 700;
-}
-
-.esi-peppol-step-content {
-    flex: 1;
-}
-
-.esi-peppol-step-title {
-    margin: 0 0 8px 0;
-    font-size: 18px;
-    font-weight: 600;
-    color: #1d2327;
-    display: flex;
-    align-items: center;
-    gap: 12px;
-}
-
-.esi-peppol-optional-badge {
-    display: inline-block;
-    padding: 2px 8px;
-    background: #e5e7eb;
-    color: #6b7280;
-    border-radius: 4px;
-    font-size: 12px;
-    font-weight: 500;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-}
-
-.esi-peppol-step-description {
-    margin: 0 0 16px 0;
-    font-size: 14px;
-    color: #646970;
-    line-height: 1.6;
-}
-
-.esi-peppol-step-value {
-    margin-top: 12px;
-    padding: 12px;
-    background: #ffffff;
-    border-radius: 6px;
-    border: 1px solid #d1d5db;
-}
-
-.esi-peppol-step-value strong {
-    display: block;
-    margin-bottom: 6px;
-    font-size: 13px;
-    color: #374151;
-    font-weight: 600;
-}
-
-.esi-peppol-step-value code {
-    display: inline-block;
-    padding: 4px 8px;
-    background: #f3f4f6;
-    border: 1px solid #d1d5db;
-    border-radius: 4px;
-    font-family: 'Courier New', Courier, monospace;
-    font-size: 13px;
-    color: #1f2937;
-}
-
-.esi-peppol-webhook-display {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-    margin: 16px 0;
-    padding: 12px;
-    background: #ffffff;
-    border-radius: 6px;
-    border: 1px solid #d1d5db;
-}
-
-.esi-peppol-webhook-url {
-    flex: 1;
-    padding: 8px 12px;
-    background: #f9fafb;
-    border: 1px solid #e5e7eb;
-    border-radius: 4px;
-    font-family: 'Courier New', Courier, monospace;
-    font-size: 13px;
-    color: #1f2937;
-    word-break: break-all;
-    line-height: 1.5;
-}
-
-.esi-peppol-step-note {
-    margin: 12px 0 0 0;
->>>>>>> f1fd1fe1015c57a9f30ec2f84ef5b774162d5a83
     font-size: 13px;
     color: #6b7280;
     font-style: italic;