To merge it if you don't wanna use winmerge you can go line by line and see what is different
Looks like most of your problem is the add-on stuff like training dummies and archery butt
this one allows more easier customizing witha little programming know how and allows more in=depth custom spawn of specific thing and little easier lag control on older systems
You have
//Vampire
PlayerMobile player = attacker as PlayerMobile;
PlayerMobile player2 = defender as PlayerMobile;
if (VampireSystem.Enabled)
{
if (player.IsVampire && ..
change to
.
//Vampire
PlayerMobile player = attacker as PlayerMobile...
bout only thing I'd add some the other Monsters to it from TOLotherwise maybe good to put it github.for other to pick up.. to run in debug mode just make a shortcut to the ServUO.exe and add "-debug" to it