Fix merge ..CONFLICT (content): Merge conflict in src/server/game/AI/CoreAI/PetAI.cpp