diff --git a/Tiering/StandardGroups.csv b/Tiering/StandardGroups.csv
index afc2f73..2068c87 100644
--- a/Tiering/StandardGroups.csv
+++ b/Tiering/StandardGroups.csv
@@ -3,7 +3,3 @@ Test Group 1,testgroup1,Security,Global,Test Group 1,"ou=Security Groups,OU=Grou
 Test Group 2,testgroup2,Security,Global,Test Group 2,"ou=Security Groups,OU=Groups",Group with random members,
 Test Group 3,testgroup3,Security,Global,Test Group 3,"ou=Security Groups,OU=Groups",Group with random members,
 Test Group 4,testgroup4,Security,Global,Test Group 4,"ou=Security Groups,OU=Groups",Group with random members,
-<<<<<<< HEAD
-=======
-
->>>>>>> eaf8dbe4a08af8c5d3b5348f68fea28f0c0bdeef