diff --git a/engine/class_modules/sc_shaman.cpp b/engine/class_modules/sc_shaman.cpp
index df88e7630c9..33618909610 100644
--- a/engine/class_modules/sc_shaman.cpp
+++ b/engine/class_modules/sc_shaman.cpp
@@ -11065,7 +11065,7 @@ void shaman_t::init_base_stats()
   if ( specialization() == SHAMAN_ELEMENTAL )
   {
     resources.base[ RESOURCE_MAELSTROM ] = 100;
-    //resources.base[ RESOURCE_MAELSTROM ]+= talent.swelling_maelstrom->effectN( 1 ).base_value();
+    resources.base[ RESOURCE_MAELSTROM ]+= talent.swelling_maelstrom->effectN( 1 ).base_value();
     resources.base[ RESOURCE_MAELSTROM ]+= talent.primordial_capacity->effectN( 1 ).base_value();
   }
 
diff --git a/profiles/TWW1/TWW1_Shaman_Elemental.simc b/profiles/TWW1/TWW1_Shaman_Elemental.simc
index 92216c34890..f38cbac8449 100644
--- a/profiles/TWW1/TWW1_Shaman_Elemental.simc
+++ b/profiles/TWW1/TWW1_Shaman_Elemental.simc
@@ -195,6 +195,7 @@ actions.single_target+=/flame_shock,moving=1,if=movement.distance>6
 actions.single_target+=/frost_shock,moving=1
 
 head=final_meals_horns,id=212428,ilevel=639,gem_id=213479
+<<<<<<< HEAD
 neck=amulet_of_earthen_craftsmanship,id=215136,bonus_id=10421/9633/8902/11144/10222/1485/10520/8960/8781,gem_id=213743/213455,crafted_stats=36/40
 shoulders=concourse_of_the_forgotten_reservoir,id=212009,ilevel=639
 back=wings_of_shattered_sorrow,id=225574,bonus_id=1540/10299,enchant_id=7403
@@ -222,5 +223,33 @@ off_hand=crest_of_the_caustic_despot,id=225579,ilevel=639
 # gear_versatility_rating=7694
 # gear_avoidance_rating=1635
 # gear_armor=66844
+=======
+neck=sureki_zealots_insignia,id=225577,bonus_id=1540/10299
+shoulders=concourse_of_the_forgotten_reservoir,id=212009,ilevel=639
+back=wings_of_shattered_sorrow,id=225574,bonus_id=1540/10299
+chest=vestments_of_the_forgotten_reservoir,id=212014,ilevel=639,enchant_id=7364
+wrists=kyvezas_covert_clasps,id=225581,ilevel=639,gem_id=213479
+hands=covenant_of_the_forgotten_reservoir,id=212012,ilevel=639
+waist=lost_watchers_remains,id=212414,ilevel=639,gem_id=213479
+legs=sarong_of_the_forgotten_reservoir,id=212010,ilevel=639,enchant_id=7534
+feet=red_scale_boots,id=133293,ilevel=639
+finger1=stitchfleshs_misplaced_signet,id=178736,ilevel=639,gem_id=213479/213479,enchant_id=7340
+finger2=seal_of_the_poisoned_pact,id=225578,ilevel=639,gem_id=213479/213479,enchant_id=7340
+trinket1=spymasters_web,id=220202,ilevel=639
+trinket2=arakara_sacbrood,id=219314,ilevel=639
+main_hand=everforged_dagger,id=222439,bonus_id=10421/9633/8902/11144/10222/1485/11301/8960,enchant_id=7460,crafted_stats=36/40
+off_hand=everforged_defender,id=222432,bonus_id=10421/9633/8902/11144/10222/1485/11301/8960,crafted_stats=36/40
+
+# Gear Summary
+# gear_ilvl=638.63
+# gear_strength=1845
+# gear_stamina=236750
+# gear_intellect=44930
+# gear_crit_rating=9978
+# gear_haste_rating=19659
+# gear_mastery_rating=4680
+# gear_versatility_rating=5690
+# gear_armor=66320
+>>>>>>> b16c3b5a780f93a394340dbed9a1f072cbc1b5b3
 # set_bonus=thewarwithin_season_1_2pc=1
 # set_bonus=thewarwithin_season_1_4pc=1
diff --git a/profiles/generators/TWW1/TWW1_Generate_Shaman.simc b/profiles/generators/TWW1/TWW1_Generate_Shaman.simc
index 09354d11e80..268bc58a36e 100644
--- a/profiles/generators/TWW1/TWW1_Generate_Shaman.simc
+++ b/profiles/generators/TWW1/TWW1_Generate_Shaman.simc
@@ -8,6 +8,7 @@ position=ranged_back
 # Farseer Lightning Bolt spam
 talents=CYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAMbzy2MjZGmZjxMDmZGAAAAAsYmNYADYWYCZWAAjpZgZbhZmYMzMbDLzYGMLDzyMzMzMGmhB
 
+<<<<<<< HEAD
 head=,id=212428,gem_id=213479,ilevel=639
 neck=,id=215136,bonus_id=10421/9633/8902/11144/10222/1485/10520/8960/8781,gem_id=213743/213455,crafted_stats=36/40
 shoulder=,id=212009,ilevel=639
@@ -24,6 +25,24 @@ trinket1=,id=220202,ilevel=639
 trinket2=,id=219314,ilevel=639
 main_hand=,id=222439,bonus_id=10421/9633/8902/11144/10222/1485/11301/8960/8790,enchant_id=7460,crafted_stats=36/40
 off_hand=,id=225579,ilevel=639
+=======
+head=final_meals_horns,id=212428,ilevel=639,gem_id=213479
+neck=sureki_zealots_insignia,id=225577,bonus_id=1540/10299
+shoulders=concourse_of_the_forgotten_reservoir,id=212009,ilevel=639
+back=wings_of_shattered_sorrow,id=225574,bonus_id=1540/10299
+chest=vestments_of_the_forgotten_reservoir,id=212014,ilevel=639,enchant_id=7364
+wrists=kyvezas_covert_clasps,id=225581,ilevel=639,gem_id=213479
+hands=covenant_of_the_forgotten_reservoir,id=212012,ilevel=639
+waist=lost_watchers_remains,id=212414,ilevel=639,gem_id=213479
+legs=sarong_of_the_forgotten_reservoir,id=212010,ilevel=639,enchant_id=7534
+feet=red_scale_boots,id=133293,ilevel=639
+finger1=stitchfleshs_misplaced_signet,id=178736,ilevel=639,gem_id=213479/213479,enchant_id=7340
+finger2=seal_of_the_poisoned_pact,id=225578,ilevel=639,gem_id=213479/213479,enchant_id=7340
+trinket1=spymasters_web,id=220202,ilevel=639
+trinket2=arakara_sacbrood,id=219314,ilevel=639
+main_hand=everforged_dagger,id=222439,bonus_id=10421/9633/8902/11144/10222/1485/11301/8960,enchant_id=7460,crafted_stats=36/40
+off_hand=everforged_defender,id=222432,bonus_id=10421/9633/8902/11144/10222/1485/11301/8960,crafted_stats=36/40
+>>>>>>> b16c3b5a780f93a394340dbed9a1f072cbc1b5b3
 
 save=TWW1_Shaman_Elemental.simc