diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt
index 7bda0f4999..86bed07082 100644
--- a/config/alienwhitelist.txt
+++ b/config/alienwhitelist.txt
@@ -32,7 +32,6 @@ pearlprophet - Protean
 phoenixx0 - Vox
 rapidvalj - Vox
 rapidvalj - Common Skrellian
-rapidvalj - High Skrellian
 rikaru19xjenkins - Xenochimera
 rixunie - Diona
 rykkastormheart - Xenochimera
@@ -48,13 +47,6 @@ storesund97 - Protean
 sharplight - Protean
 tastypred - Black-Eyed Shadekin
 tastypred - Xenochimera
-<<<<<<< HEAD
-tastypred - Protean
-=======
-terrestris - Common Skrellian
-terrestris - Vox
-thedavestdave - Protean
->>>>>>> 2cdfa72cdd... Merge pull request #13485 from Cameron653/LANGUAGE_MODIFIDICATION
 timidvi - Diona
 varonis - Xenochimera
 verkister - Xenochimera