diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 44b350ede..a9f9c5fe2 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -7394,11 +7394,15 @@ bool Spell::IsNeedSendToClient() const
            m_spellInfo->speed > 0.0f || (!m_triggeredByAuraSpell && !m_IsTriggeredSpell);
 }
 
-bool Spell::IsTriggeredSpellWithRedundentData() const
+bool Spell::IsTriggeredSpellWithRedundentCastTime() const
 {
+<<<<<<< HEAD
     return m_triggeredByAuraSpell || m_triggeredBySpellInfo ||
         // possible not need after above check?
         m_IsTriggeredSpell && (m_spellInfo->GetManaCost() || m_spellInfo->GetManaCostPercentage());
+=======
+    return m_IsTriggeredSpell && (m_spellInfo->manaCost || m_spellInfo->ManaCostPercentage);
+>>>>>>> 47aa389... [12468] Use normal cast time for triggered spells by default
 }
 
 bool Spell::HaveTargetsForEffect(SpellEffectIndex effect) const
diff --git a/src/game/Spell.h b/src/game/Spell.h
index b14d612e4..a8c221bf4 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -476,7 +476,11 @@ class Spell
         uint64 GetDelayMoment() const { return m_delayMoment; }
 
         bool IsNeedSendToClient() const;                    // use for hide spell cast for client in case when cast not have client side affect (animation or log entries)
+<<<<<<< HEAD
         bool IsTriggeredSpellWithRedundentData() const;     // use for ignore some spell data for triggered spells like cast time, some triggered spells have redundant copy data from main spell for client use purpose
+=======
+        bool IsTriggeredSpellWithRedundentCastTime() const; // use for ignore some spell data for triggered spells like cast time, some triggered spells have redundent copy data from main spell for client use purpose
+>>>>>>> 47aa389... [12468] Use normal cast time for triggered spells by default
 
         CurrentSpellTypes GetCurrentContainer();
 
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 870d7fc7d..3c8d011f5 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -103,7 +103,7 @@ uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell const* spell)
     if (spell)
     {
         // some triggered spells have data only usable for client
-        if (spell->IsTriggeredSpellWithRedundentData())
+        if (spell->IsTriggeredSpellWithRedundentCastTime())
             return 0;
 
         // spell targeted to non-trading trade slot item instant at trade success apply
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 204ae86a5..4e38eafeb 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12669"
+ #define REVISION_NR "12670"
 #endif // __REVISION_NR_H__