diff --git a/shootyepgp.toc b/shootyepgp.toc
index 9df869d..ee9b42c 100644
--- a/shootyepgp.toc
+++ b/shootyepgp.toc
@@ -7,11 +7,7 @@
 ## X-Website: https://github.com/cinecom/shootyepgp/
 ## X-Category: Guild
 ## X-Credits: shooty, Qcat(zhCN)
-<<<<<<< HEAD
 ## Version: 10.15 <ERROR>
-=======
-## Version: 10.14 <ERROR>
->>>>>>> 4dda482e881a603c58714ccc3f548c5c53eb30bf
 ## X-Alpha: 
 ## OptionalDeps: Ace2
 ## SavedVariables: sepgp_saychannel, sepgp_groupbyclass, sepgp_groupbyarmor, sepgp_groupbyrole, sepgp_raidonly, sepgp_dbver, sepgp_debug, sepgp_fubar, sepgp_sound