From 31d49b5c9bf7137e2153249a7395434886354ef8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Oct 2021 18:11:34 -0700
Subject: [PATCH] Fixed merge error parse error

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Importer/UserImporter.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index aa6c23d30..136b9bfe9 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -120,15 +120,14 @@ class UserImporter extends ItemImporter
      */
     public function createOrFetchDepartment($department_name)
     {
-
+        if (is_null($department_name) || $department_name == ''){
             return null;
         }
 
-        
+
         $department = Department::where(['name' => $department_name])->first();
         if ($department) {
-            $this->log('A matching department '.$department_name.' already exists');
-
+            $this->log('A matching department ' . $department_name . ' already exists');
             return $department->id;
         }
 
@@ -137,15 +136,14 @@ class UserImporter extends ItemImporter
         $department->user_id = $this->user_id;
 
         if ($department->save()) {
-            $this->log('department '.$department_name.' was created');
-
+            $this->log('department ' . $department_name . ' was created');
             return $department->id;
         }
 
         $this->logError($department, 'Department');
-
         return null;
     }
+    
 
     public function sendWelcome($send = true)
     {