TD-3918 Resolving merge conflict

Author: sherif-olaboye

DigitalLearningSolutions.Web/Services/UserService.cs

@@ -11,6 +11,7 @@ namespace DigitalLearningSolutions.Web.Services
     using DigitalLearningSolutions.Data.Models;
     using DigitalLearningSolutions.Data.Models.User;
     using DigitalLearningSolutions.Data.Utilities;
+    using DocumentFormat.OpenXml.Office2010.Excel;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Logging;
     using ConfigurationExtensions = DigitalLearningSolutions.Data.Extensions.ConfigurationExtensions;
@@ -156,6 +157,8 @@ void SetCentreEmail(
         List<AdminUser> GetAdminUsersByCentreId(int centreId);
 
         AdminUser? GetAdminUserById(int id);
+        string GetUserDisplayName(int userId);
+
     }
 
     public class UserService : IUserService
@@ -835,5 +838,10 @@ public List<AdminUser> GetAdminUsersByCentreId(int centreId)
             return userDataService.GetAdminUserById(id);
 
         }
+
+        public string GetUserDisplayName(int userId)
+        {
+            return userDataService.GetUserDisplayName(userId);
+        }
     }
 }