resolved merge conflicts

QuestPaths/quest-v1.json

@@ -838,6 +838,7 @@
                 "description": "The action to use",
                 "enum": [
                   "Heavy Swing",
+                  "Heavy Shot",
                   "Cure",
                   "Esuna",
                   "Physick",

Questionable.Model/Questing/Converter/ActionConverter.cs

@@ -8,6 +8,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
     private static readonly Dictionary<EAction, string> Values = new()
     {
         { EAction.HeavySwing, "Heavy Swing" },
+        { EAction.HeavyShot, "Heavy Shot" },
         { EAction.Cure, "Cure" },
         { EAction.Esuna, "Esuna" },
         { EAction.Physick, "Physick" },

Questionable.Model/Questing/EAction.cs

@@ -7,6 +7,7 @@ namespace Questionable.Model.Questing;
 public enum EAction
 {
     HeavySwing = 31,
+    HeavyShot = 97,
     Cure = 120,
     Esuna = 7568,
     Physick = 190,