diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs
index 71a08a70dbf..f3f5ea1ef52 100644
--- a/Content.Shared/Administration/AdminFlags.cs
+++ b/Content.Shared/Administration/AdminFlags.cs
@@ -110,11 +110,14 @@ public enum AdminFlags : uint
         ///</summary>
         Pii = 1 << 18,
 
+<<<<<<< HEAD
         /// <summary>
         /// DeltaV - The ability to whitelist people. Either this permission or +BAN is required for remove.
         /// </summary>
         Whitelist = 1 << 20,
 
+=======
+>>>>>>> 94a113dbd6 (Adds a Pii Flag, Censors Hwid and Ip  (#27776))
         /// <summary>
         ///     Dangerous host permissions like scsi.
         /// </summary>