diff --git a/html/autocomplete.php b/html/autocomplete.php
index 2b3194c49cf826c13bb0be141ace28990bda9195..0f902f0aa47f136dac50bd2d9947ae6bcc698f75 100755
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -42,7 +42,7 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
   if (session::is_set("pathMapping") && count($_POST) == 1) {
     $res          = "";
     $pathMapping  = session::get("pathMapping");
-    $search       = preg_replace('/"/', '"', current($_POST));
+    $search       = preg_replace('/"/', '"', (string) current($_POST));
 
     $config         = session::get('config');
     $departmentInfo = $config->getDepartmentInfo();
@@ -50,23 +50,15 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
       if (!isset($pathMapping[$dn])) {
         continue;
       }
-<<<<<<< HEAD
-      if (mb_stristr((string) $info['name'], (string) $search) !== FALSE) {
+      if (mb_stristr((string) $info['name'], $search) !== FALSE) {
         $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
-      if (mb_stristr((string) $info['description'], (string) $search) !== FALSE) {
-=======
-      if (mb_stristr($info['name'], $search) !== FALSE) {
+      if (mb_stristr((string) $info['description'], $search) !== FALSE) {
         $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
-      if (mb_stristr($info['description'], $search) !== FALSE) {
->>>>>>> parent of e7456f50 (:sparkles: (html) - html folder php82)
-        $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
-        continue;
-      }
-      if (mb_stristr($pathMapping[$dn], (string) $search) !== FALSE) {
+      if (mb_stristr($pathMapping[$dn], $search) !== FALSE) {
         $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
diff --git a/html/index.php b/html/index.php
index 5659b9f38cf314ecbfceafcf2395a3735d1d37d6..501f2404c32e510396074088a33bd806e2d3b4ea 100755
--- a/html/index.php
+++ b/html/index.php
@@ -146,19 +146,12 @@ if (($config->get_cfg_value('forcessl') == 'TRUE') && ($ssl != '')) {
 }
 
 if (isset($_REQUEST['message'])) {
-  switch ($_REQUEST['message']) {
-    case 'expired':
-      $message = _('Your FusionDirectory session has expired!');
-      break;
-    case 'invalidparameter':
-      $message = sprintf(_('Invalid plugin parameter "%s"!'), $_REQUEST['plug']);
-      break;
-    case 'nosession':
-      $message = _('No session found!');
-      break;
-    default:
-      $message = $_REQUEST['message'];
-  }
+  $message = match ($_REQUEST['message']) {
+      'expired' => _('Your FusionDirectory session has expired!'),
+      'invalidparameter' => sprintf(_('Invalid plugin parameter "%s"!'), $_REQUEST['plug']),
+      'nosession' => _('No session found!'),
+      default => $_REQUEST['message'],
+  };
 }
 
 LoginMethod::loginProcess();
diff --git a/html/setup.php b/html/setup.php
index 305a076c617969af38e4de55947f5f5c544a1094..a39929fecdd9d526d6f040d444eaf2cbc1ef2aac 100755
--- a/html/setup.php
+++ b/html/setup.php
@@ -82,7 +82,7 @@ if (isset($_POST['lang_selected']) && $_POST['lang_selected'] != '') {
   $lang = $_POST['lang_selected'];
 
   /* Append .UTF-8 to language string if necessary */
-  if (!preg_match('/utf(-)?8$/i', $lang)) {
+  if (!preg_match('/utf(-)?8$/i', (string) $lang)) {
     $lang .= '.UTF-8';
   }
 } elseif (session::is_set('lang')) {