From fa6d7d3f3db23aa4c0f64016493162260c0245a4 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Tue, 26 Aug 2025 16:53:55 +0200
Subject: [PATCH] Fixed merge conflicts

---
 .../subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json     | 5 -----
 .../subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json         | 5 -----
 .../subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json        | 5 -----
 .../subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json | 5 -----
 .../subclass_Elemental_Origin_wg1H0hROc2acHwZh.json          | 5 -----
 .../subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json    | 5 -----
 .../subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json  | 5 -----
 .../subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json       | 5 -----
 .../subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json  | 5 -----
 src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json | 5 -----
 .../subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json      | 5 -----
 .../subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json     | 5 -----
 .../subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json      | 5 -----
 .../subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json         | 5 -----
 .../subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json    | 5 -----
 .../subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json      | 5 -----
 .../subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json           | 5 -----
 .../subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json      | 5 -----
 18 files changed, 90 deletions(-)

diff --git a/src/packs/subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json b/src/packs/subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json
index a3339a44..fcfc2cc8 100644
--- a/src/packs/subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json
+++ b/src/packs/subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json
@@ -53,13 +53,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754268237448,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054727,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943503629,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!TIUsIlTS1WkK5vr2"
 }
diff --git a/src/packs/subclasses/subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json b/src/packs/subclasses/subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json
index 33a8e1cd..0ce7cd36 100644
--- a/src/packs/subclasses/subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json
+++ b/src/packs/subclasses/subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json
@@ -49,13 +49,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754256077777,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054856,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943544886,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!NAFU9roaVG7f3RNJ"
 }
diff --git a/src/packs/subclasses/subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json b/src/packs/subclasses/subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json
index 30ec4e5a..f14668b2 100644
--- a/src/packs/subclasses/subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json
+++ b/src/packs/subclasses/subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json
@@ -45,13 +45,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754256112978,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054862,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943545973,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!bcNe5qP3o6CKadhK"
 }
diff --git a/src/packs/subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json b/src/packs/subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json
index 7833d522..9ae4872c 100644
--- a/src/packs/subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json
+++ b/src/packs/subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json
@@ -49,13 +49,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754352806098,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054704,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943522722,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!M5mpGoAj8LRkylrY"
 }
diff --git a/src/packs/subclasses/subclass_Elemental_Origin_wg1H0hROc2acHwZh.json b/src/packs/subclasses/subclass_Elemental_Origin_wg1H0hROc2acHwZh.json
index 56641706..ac00d7ad 100644
--- a/src/packs/subclasses/subclass_Elemental_Origin_wg1H0hROc2acHwZh.json
+++ b/src/packs/subclasses/subclass_Elemental_Origin_wg1H0hROc2acHwZh.json
@@ -45,13 +45,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754349604941,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054774,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943535524,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!wg1H0hROc2acHwZh"
 }
diff --git a/src/packs/subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json b/src/packs/subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json
index 086f8f32..cf2ff2d5 100644
--- a/src/packs/subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json
+++ b/src/packs/subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json
@@ -53,13 +53,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754322815758,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054765,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943514465,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!h161OSIK24Up4qNd"
 }
diff --git a/src/packs/subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json b/src/packs/subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json
index 5557e793..b7bb2dc6 100644
--- a/src/packs/subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json
+++ b/src/packs/subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json
@@ -45,13 +45,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754349604941,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054790,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943536628,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!GLpRVxnY5E82khxH"
 }
diff --git a/src/packs/subclasses/subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json b/src/packs/subclasses/subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json
index 861a04a3..eb21a9b2 100644
--- a/src/packs/subclasses/subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json
+++ b/src/packs/subclasses/subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json
@@ -57,13 +57,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754253538384,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054682,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943553625,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!qqQlgCqhOivUFoQn"
 }
diff --git a/src/packs/subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json b/src/packs/subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json
index 54fbb2a9..18468eee 100644
--- a/src/packs/subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json
+++ b/src/packs/subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json
@@ -57,13 +57,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754253587683,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054698,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943555081,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!4y9Ph7RsCIAbkwTk"
 }
diff --git a/src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json b/src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json
index 80f79d81..af30bf9c 100644
--- a/src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json
+++ b/src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json
@@ -57,13 +57,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754245881893,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054824,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943487549,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!rKRxFBlkbh9cDK8K"
 }
diff --git a/src/packs/subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json b/src/packs/subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json
index 046d86d9..4318cf68 100644
--- a/src/packs/subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json
+++ b/src/packs/subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json
@@ -45,13 +45,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754323643089,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054771,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943515526,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!95QxNZwgyEm1LqdG"
 }
diff --git a/src/packs/subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json b/src/packs/subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json
index 7b385171..d3ff41ce 100644
--- a/src/packs/subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json
+++ b/src/packs/subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json
@@ -43,13 +43,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754174653653,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054841,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943465827,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_id": "ld8MIvk0xVJydSBz",
   "sort": 100000,
diff --git a/src/packs/subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json b/src/packs/subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json
index e59ef3b7..d8bf2b7f 100644
--- a/src/packs/subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json
+++ b/src/packs/subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json
@@ -49,13 +49,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754246011733,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054833,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943488691,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!SUo8NPBPO8aN193u"
 }
diff --git a/src/packs/subclasses/subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json b/src/packs/subclasses/subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json
index 684fad9e..07606cc9 100644
--- a/src/packs/subclasses/subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json
+++ b/src/packs/subclasses/subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json
@@ -53,13 +53,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754221346981,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054814,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943479431,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!xp0XMjYT85Q7E90o"
 }
diff --git a/src/packs/subclasses/subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json b/src/packs/subclasses/subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json
index 9f04bbff..40e39611 100644
--- a/src/packs/subclasses/subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json
+++ b/src/packs/subclasses/subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json
@@ -45,13 +45,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754221102716,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054802,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943478132,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!W9hs5kxOWeY7eA4Q"
 }
diff --git a/src/packs/subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json b/src/packs/subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json
index 79afea4b..c8261fb8 100644
--- a/src/packs/subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json
+++ b/src/packs/subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json
@@ -49,13 +49,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754268318903,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054752,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943505016,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!zsUglcU4NgZ8tNgZ"
 }
diff --git a/src/packs/subclasses/subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json b/src/packs/subclasses/subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json
index ddd9b0e3..e6089c6f 100644
--- a/src/packs/subclasses/subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json
+++ b/src/packs/subclasses/subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json
@@ -49,13 +49,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754354451615,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054713,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943523928,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_key": "!items!y7ERWRIpJsdP9Re4"
 }
diff --git a/src/packs/subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json b/src/packs/subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json
index bbcebede..8fdc305c 100644
--- a/src/packs/subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json
+++ b/src/packs/subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json
@@ -47,13 +47,8 @@
     "systemId": "daggerheart",
     "systemVersion": "1.1.0",
     "createdTime": 1754174655078,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054850,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
     "modifiedTime": 1755943467695,
     "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
   },
   "_id": "XTSODVM8st75Os8M",
   "sort": 200000,