diff --git a/Assets/PerfectWorld/Scripts/Debug/SkillTriggerPanel.cs b/Assets/PerfectWorld/Scripts/Debug/SkillTriggerPanel.cs
index f1130e2007..05a9573489 100644
--- a/Assets/PerfectWorld/Scripts/Debug/SkillTriggerPanel.cs
+++ b/Assets/PerfectWorld/Scripts/Debug/SkillTriggerPanel.cs
@@ -93,12 +93,8 @@ namespace BrewMonster
         private void Awake()
         {
             Instance = this;
-<<<<<<< HEAD
-            SkillStubs.Init();
-=======
             if (channelCancelButton != null)
                 channelCancelButton.onClick.AddListener(CancelChanneling);
->>>>>>> 6fde1d1583 (Add requirement for play skill)
         }
 
         private void OnDestroy()