diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results
index 6c546790ff..0613d995f6 100644
--- a/sim/warlock/dps/TestAffliction.results
+++ b/sim/warlock/dps/TestAffliction.results
@@ -102,15 +102,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 0.3498
-  weights: 0
-  weights: 0.85175
-=======
   weights: 0.33433
   weights: 0
   weights: 1.14914
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -118,13 +112,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 4.33415
-  weights: 1.63252
-=======
   weights: 3.6844
   weights: 1.72181
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -162,15 +151,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 0.10795
-  weights: 0
-  weights: -0.37008
-=======
   weights: 1.57318
   weights: 0
   weights: 1.52472
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -178,13 +161,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 10.8692
-  weights: 7.49935
-=======
   weights: 11.50014
   weights: 7.74406
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -219,192 +197,112 @@ stat_weights_results: {
 dps_results: {
  key: "TestAffliction-Lvl40-Average-Default"
  value: {
-<<<<<<< HEAD
-  dps: 598.73464
-  tps: 567.32935
-=======
   dps: 589.7335
   tps: 558.99314
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 591.15328
-  tps: 1196.1784
-=======
   dps: 586.14869
   tps: 1187.06506
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 591.15328
-  tps: 559.66614
-=======
   dps: 586.14869
   tps: 555.35323
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 585.39964
-  tps: 542.89609
-=======
   dps: 576.63077
   tps: 534.52574
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 373.63797
-  tps: 998.20618
-=======
   dps: 369.10544
   tps: 997.3032
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 373.63797
-  tps: 360.47239
-=======
   dps: 369.10544
   tps: 356.11261
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 379.52923
-  tps: 353.1449
-=======
   dps: 375.98542
   tps: 349.74382
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-<<<<<<< HEAD
-  dps: 601.89986
-  tps: 570.08021
-=======
   dps: 591.38767
   tps: 559.89636
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl50-Average-Default"
  value: {
-<<<<<<< HEAD
-  dps: 1354.36862
-  tps: 1153.9304
-=======
   dps: 1348.75704
   tps: 1144.79965
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1952.20599
-  tps: 2701.44989
-=======
   dps: 1953.77428
   tps: 2704.98061
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1343.22973
-  tps: 1144.42781
-=======
   dps: 1345.46103
   tps: 1143.46075
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1374.34558
-  tps: 1206.44251
-=======
   dps: 1407.89852
   tps: 1218.97962
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1198.98377
-  tps: 2082.05249
-=======
   dps: 1197.75979
   tps: 2075.21042
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 753.85192
-  tps: 633.82532
-=======
   dps: 754.00531
   tps: 629.17208
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 716.68652
-  tps: 639.37389
-=======
   dps: 748.67521
   tps: 657.61708
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-<<<<<<< HEAD
-  dps: 1350.88053
-  tps: 1150.95943
-=======
   dps: 1352.18224
   tps: 1148.54549
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results
index 7fe5292a31..6a7c83c54c 100644
--- a/sim/warlock/dps/TestDemonology.results
+++ b/sim/warlock/dps/TestDemonology.results
@@ -53,9 +53,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.15074
+  weights: -0.01331
   weights: 0
-  weights: 0.9444
+  weights: 0.53679
   weights: 0
   weights: 0
   weights: 0
@@ -63,8 +63,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.16824
-  weights: 2.10439
+  weights: 5.40535
+  weights: 2.12408
   weights: 0
   weights: 0
   weights: 0
@@ -99,56 +99,56 @@ stat_weights_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-Average-Default"
  value: {
-  dps: 655.4921
-  tps: 545.9111
+  dps: 644.30134
+  tps: 535.48342
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 656.18105
-  tps: 869.51358
+  dps: 644.9294
+  tps: 854.2803
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 656.18105
-  tps: 548.00703
+  dps: 644.9294
+  tps: 537.44821
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 699.63125
-  tps: 587.86449
+  dps: 688.36389
+  tps: 577.16233
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 377.74705
-  tps: 680.05906
+  dps: 374.56765
+  tps: 675.01942
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 377.74705
-  tps: 336.38272
+  dps: 374.56765
+  tps: 333.51743
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 431.0382
-  tps: 373.24835
+  dps: 427.48813
+  tps: 369.96447
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 659.77487
-  tps: 552.11402
+  dps: 647.42559
+  tps: 540.37038
  }
 }
diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results
index 02b922dff7..4ddb013eb1 100644
--- a/sim/warlock/dps/TestDestruction.results
+++ b/sim/warlock/dps/TestDestruction.results
@@ -200,11 +200,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 0.02916
-=======
   weights: 0.02789
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0.13619
   weights: 0
@@ -214,13 +210,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 3.12032
-  weights: 0.17147
-=======
   weights: 3.0746
   weights: 0.16813
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -258,15 +249,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: -2.79953
-  weights: 0
-  weights: 2.88604
-=======
   weights: -1.44202
   weights: 0
   weights: 1.81676
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -274,13 +259,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 8.96163
-  weights: 5.41451
-=======
   weights: 2.55315
   weights: 7.46154
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -371,192 +351,112 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-Average-Default"
  value: {
-<<<<<<< HEAD
-  dps: 147.85594
-  tps: 79.59037
-=======
   dps: 145.88362
   tps: 78.5602
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 144.92268
-  tps: 1045.56735
-=======
   dps: 143.06771
   tps: 1041.4637
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 144.92268
-  tps: 74.88232
-=======
   dps: 143.06771
   tps: 74.27992
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 243.52858
-  tps: 163.02771
-=======
   dps: 239.97289
   tps: 160.13069
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 104.87286
-  tps: 1017.4809
-=======
   dps: 103.79064
   tps: 1017.94113
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 104.87286
-  tps: 65.5411
-=======
   dps: 103.79064
   tps: 65.5804
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 167.8639
-  tps: 113.91043
-=======
   dps: 166.18089
   tps: 112.4566
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-<<<<<<< HEAD
-  dps: 145.19356
-  tps: 75.24074
-=======
   dps: 143.33342
   tps: 74.63173
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Average-Default"
  value: {
-<<<<<<< HEAD
-  dps: 1287.74693
-  tps: 1134.08907
-=======
   dps: 1279.64056
   tps: 1124.37828
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 2034.51456
-  tps: 2541.93019
-=======
   dps: 2023.03682
   tps: 2526.57451
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1275.03876
-  tps: 1121.36481
-=======
   dps: 1279.89626
   tps: 1126.77888
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1376.22675
-  tps: 1241.83769
-=======
   dps: 1400.19427
   tps: 1252.13572
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1258.55476
-  tps: 1886.49774
-=======
   dps: 1250.33491
   tps: 1871.63283
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 704.70424
-  tps: 625.35902
-=======
   dps: 707.12608
   tps: 622.85398
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 745.0004
-  tps: 688.1706
-=======
   dps: 753.10698
   tps: 680.0301
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-<<<<<<< HEAD
-  dps: 1289.46603
-  tps: 1135.95401
-=======
   dps: 1265.86558
   tps: 1110.17806
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results
index 267abac21a..b9c39977cd 100644
--- a/sim/warlock/tank/TestDemonology.results
+++ b/sim/warlock/tank/TestDemonology.results
@@ -53,9 +53,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.11029
+  weights: 0.53787
   weights: 0
-  weights: 0.40845
+  weights: 0.96167
   weights: 0
   weights: 0
   weights: 0
@@ -63,8 +63,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.4248
-  weights: 1.49799
+  weights: 6.33785
+  weights: 1.43985
   weights: 0
   weights: 0
   weights: 0
@@ -99,56 +99,56 @@ stat_weights_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-Average-Default"
  value: {
-  dps: 595.65356
-  tps: 1142.61143
+  dps: 584.14614
+  tps: 1116.55471
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 559.95417
-  tps: 1599.42562
+  dps: 547.58615
+  tps: 1566.83604
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 559.95417
-  tps: 1083.55832
+  dps: 547.58615
+  tps: 1054.63536
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 585.79062
-  tps: 1131.21821
+  dps: 574.45826
+  tps: 1105.46708
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 328.98486
-  tps: 1246.16221
+  dps: 324.88775
+  tps: 1244.32824
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 328.98486
-  tps: 690.61761
+  dps: 324.88775
+  tps: 680.77795
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 352.74924
-  tps: 730.55989
+  dps: 348.78087
+  tps: 721.48947
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 594.40653
-  tps: 1139.19022
+  dps: 580.66325
+  tps: 1110.11424
  }
 }
diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results
index 9da14ac499..5c8642f1c0 100644
--- a/sim/warlock/tank/TestDestruction.results
+++ b/sim/warlock/tank/TestDestruction.results
@@ -200,15 +200,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 0.35158
-  weights: 0
-  weights: 0.66799
-=======
   weights: 0.35384
   weights: 0
   weights: 0.6606
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -216,13 +210,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 6.02367
-  weights: 3.14437
-=======
   weights: 6.17043
   weights: 3.075
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -260,15 +249,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: -1.3246
-  weights: 0
-  weights: 1.63974
-=======
   weights: 4.65261
   weights: 0
   weights: 2.7333
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -276,13 +259,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-<<<<<<< HEAD
-  weights: 4.25444
-  weights: 6.2618
-=======
   weights: 1.82841
   weights: 5.20197
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
   weights: 0
   weights: 0
   weights: 0
@@ -373,208 +351,120 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-Average-Default"
  value: {
-<<<<<<< HEAD
-  dps: 501.59249
-  tps: 1120.94831
-=======
   dps: 492.09076
   tps: 1097.47155
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 847.33327
-  tps: 1844.06872
-=======
   dps: 830.20472
   tps: 1810.90658
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 464.76164
-  tps: 1051.35759
-=======
   dps: 457.89014
   tps: 1034.99179
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 471.12595
-  tps: 1024.26014
-=======
   dps: 462.12157
   tps: 1002.41711
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 594.16616
-  tps: 1367.80567
-=======
   dps: 589.19527
   tps: 1356.56892
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 306.7561
-  tps: 665.27677
-=======
   dps: 300.11888
   tps: 648.05459
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 308.30462
-  tps: 650.14512
-=======
   dps: 304.01599
   tps: 639.82598
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-<<<<<<< HEAD
-  dps: 494.53293
-  tps: 1108.80093
-=======
   dps: 484.94757
   tps: 1085.30414
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Average-Default"
  value: {
-<<<<<<< HEAD
-  dps: 1301.56578
-  tps: 2159.22546
-  hps: 19.2738
-=======
   dps: 1303.04733
   tps: 2143.55807
   hps: 19.32065
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1872.49134
-  tps: 3955.07317
-  hps: 15.19136
-=======
   dps: 1849.43339
   tps: 3913.73558
   hps: 15.29428
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1250.69869
-  tps: 2055.66475
-  hps: 15.35508
-=======
   dps: 1241.90915
   tps: 2042.32171
   hps: 15.32229
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1154.1029
-  tps: 1968.20354
-  hps: 14.95714
-=======
   dps: 1188.88109
   tps: 1999.75077
   hps: 15.51045
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongMultiTarget"
  value: {
-<<<<<<< HEAD
-  dps: 1158.43785
-  tps: 2859.14027
-  hps: 10.27667
-=======
   dps: 1172.34779
   tps: 2857.70841
   hps: 10.25167
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 703.36383
-  tps: 1139.8556
-  hps: 10.20167
-=======
   dps: 715.59031
   tps: 1139.90073
   hps: 10.21333
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-ShortSingleTarget"
  value: {
-<<<<<<< HEAD
-  dps: 662.61416
-  tps: 1102.67544
-  hps: 10.525
-=======
   dps: 669.15792
   tps: 1098.91913
   hps: 10.36667
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-<<<<<<< HEAD
-  dps: 1267.37011
-  tps: 2097.51103
-  hps: 19.53577
-=======
   dps: 1285.98691
   tps: 2118.11926
   hps: 19.63687
->>>>>>> 8670393ed (Fix imp base stats and stamina scaling)
  }
 }