Changelog# Conflicts:# FrostEmu.World/Entities/Entity.cs# FrostEmu.World/Events/PvP/GuildWar.cs Previous Update Next Update