# Conflicts: # src/server/game/AI/CreatureAI.cpp # src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp # src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp # src/server/scripts/Kalimdor/zone_desolace.cpp # src/server/scripts/Northrend/zone_borean_tundra.cpp