# Conflicts: # src/server/game/Combat/ThreatManager.cpp # src/server/game/Entities/Creature/Creature.cpp # src/server/game/Entities/Unit/Unit.cpp # src/server/game/Entities/Unit/Unit.h
# Conflicts: # src/server/game/Combat/ThreatManager.cpp # src/server/game/Entities/Creature/Creature.cpp # src/server/game/Entities/Unit/Unit.cpp # src/server/game/Entities/Unit/Unit.h