diff --git a/resources/donators.lua b/resources/donators.lua
index 24e3afcd..3a844b5e 100644
--- a/resources/donators.lua
+++ b/resources/donators.lua
@@ -15,7 +15,11 @@ Module.donators = {
     ['Terarink'] = d.rank + d.train,
     ['Xertez'] = d.rank,
     ['Chevalier1200'] = d.rank + d.train,
+<<<<<<< HEAD
     ['DraugTheWhopper'] = d.rank + d.train
+=======
+    ['DraugTheWhopper'] = d.rank
+>>>>>>> 563e85019404023681e9ca2ddf8b33eb37a1ff1d
 }
 
 Module.welcome_messages = {