diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index a9f9c5fe2..d84dba104 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -7396,13 +7396,7 @@ bool Spell::IsNeedSendToClient() 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
+    return m_IsTriggeredSpell && (m_spellInfo->GetManaCost() || m_spellInfo->GetManaCostPercentage());
 }
 
 bool Spell::HaveTargetsForEffect(SpellEffectIndex effect) const
diff --git a/src/game/Spell.h b/src/game/Spell.h
index a8c221bf4..ee7d1b36c 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -476,11 +476,7 @@ 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/shared/revision_nr.h b/src/shared/revision_nr.h
index 4e38eafeb..bc03c16e1 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 "12670"
+ #define REVISION_NR "12671"
 #endif // __REVISION_NR_H__