--- deliantra/server/Changes	2008/05/04 20:40:52	1.133
+++ deliantra/server/Changes	2008/05/04 20:41:19	1.134
@@ -6,15 +6,11 @@
           some spellcasting. if I then started using karate, I would get all the 
                     stateffects from the bow
 
-<<<<<<< Changes
-	- get rid of costly object_from_name conversion for altar effects.
-        - fix map difficulty calculation for generators.
-
-=======
 2.54
         - (maps) fixed the death certificate system in nimbus
+	- get rid of costly object_from_name conversion for altar effects.
+        - fix map difficulty calculation for generators.
 
->>>>>>> 1.132
 2.53  Sun May  4 17:32:48 CEST 2008
 	- bugfix: custom skill settings were not saved by the server.
 	- bugfix: remove did not actually remove items from the inventory, leaving