Resolve merge conflicts in multiple files and clean up integration logic

profile.php

@@ -48,7 +48,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         exit;
     }
 
-<<<<<<< HEAD
     // 2b. Outlook synchronisatievoorkeuren opslaan
     elseif ($action === 'save_outlook_settings') {
         $syncInterval = (int)($_POST['sync_interval_seconds'] ?? 30);
@@ -65,9 +64,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         $message = "Uw Microsoft Outlook synchronisatievoorkeur is succesvol opgeslagen.";
         $messageType = 'success';
     }
-
-=======
->>>>>>> dd738e670b78819c11e329da93db1b472808f195
     // 3. Jira Opslaan & Testen
     elseif ($action === 'save_jira') {
         $companyDomain = jira_get_company_domain();
@@ -482,7 +478,6 @@ require_once __DIR__ . '/includes/header.php';
                 </div>
             </div>
 
-<<<<<<< HEAD
             <form method="POST" class="mt-4 p-4 rounded-xl bg-slate-50/70 dark:bg-slate-900/60 border border-slate-200/80 dark:border-slate-800 flex flex-col sm:flex-row sm:items-center justify-between gap-4">
                 <input type="hidden" name="action" value="save_outlook_settings">
                 <div class="space-y-1">
@@ -508,9 +503,6 @@ require_once __DIR__ . '/includes/header.php';
                     </button>
                 </div>
             </form>
-
-=======
->>>>>>> dd738e670b78819c11e329da93db1b472808f195
             <div class="mt-4 p-3.5 rounded-xl bg-teal-50 dark:bg-teal-500/10 border border-teal-200 dark:border-teal-500/20 text-teal-800 dark:text-teal-300 text-xs flex items-center justify-between">
                 <div class="flex items-center space-x-2">
                     <i data-lucide="check-circle" class="w-4 h-4 text-teal-600 dark:text-teal-400 flex-shrink-0"></i>