diff --git a/.gitignore b/.gitignore
index 23d111f..3da7f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,5 +39,9 @@ luac.out
 *.x86_64
 *.hex
 
+<<<<<<< HEAD
+.vscode
+=======
 .vscode
 
+>>>>>>> 1.4.2
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5d85dce..d6824c9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,17 @@
 {
+<<<<<<< HEAD
+	"Lua.diagnostics.globals": [
+		"ReloadUI",
+		"StaticPopupDialogs",
+		"StaticPopup_Show",
+		"GetCVarBool",
+		"StopMusic",
+		"_G",
+		"string",
+		"unpack",
+		"SetCVar",
+		"UIParent"
+=======
 	"Lua.runtime.version": "Lua 5.1",
 	"Lua.runtime.builtin": {
 		"basic": "disable",
@@ -18,5 +31,6 @@
 		"ReloadUI",
 		"StaticPopupDialogs",
 		"StaticPopup_Show"
+>>>>>>> 1.4.2
 	]
 }
diff --git a/modules/UnitFrames/UnitframesPlayer.lua b/modules/UnitFrames/UnitframesPlayer.lua
index ef63818..92ec4b8 100644
--- a/modules/UnitFrames/UnitframesPlayer.lua
+++ b/modules/UnitFrames/UnitframesPlayer.lua
@@ -1,7 +1,6 @@
 local NoobTacoUI, E, L, V, P, G = unpack(select(2, ...))
 
 function NoobTacoUI:UnitframePlayer()
-
     E.db["unitframe"]["units"]["player"]["debuffs"]["anchorPoint"] = "TOPRIGHT"
     E.db["unitframe"]["units"]["player"]["debuffs"]["growthX"] = "LEFT"
     E.db["unitframe"]["units"]["player"]["debuffs"]["sizeOverride"] = 40
@@ -51,10 +50,11 @@ function NoobTacoUI:UnitframePlayer()
     E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerHealth"]["fontOutline"] = "NONE"
     E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerHealth"]["justifyH"] = "RIGHT"
     E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerHealth"]["size"] = 15
-    E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerHealth"]["text_format"] = "[health:current-percent:shortvalue]"
+    E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerHealth"]["text_format"] =
+        "[health:current-percent:shortvalue]"
     E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerHealth"]["xOffset"] = -5
     E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerHealth"]["yOffset"] = -5
-    -- 
+    --
     E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerPower"]["attachTextTo"] = "Power"
     E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerPower"]["xOffset"] = -5
     E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerPower"]["text_format"] = "[power:current]"
diff --git a/modules/UnitFrames/UnitframesTarget.lua b/modules/UnitFrames/UnitframesTarget.lua
index 326e056..5e5b5e0 100644
--- a/modules/UnitFrames/UnitframesTarget.lua
+++ b/modules/UnitFrames/UnitframesTarget.lua
@@ -1,7 +1,6 @@
 local NoobTacoUI, E, L, V, P, G = unpack(select(2, ...))
 
 function NoobTacoUI:UnitframeTarget()
-
     E.db["unitframe"]["units"]["target"]["buffs"]["anchorPoint"] = "TOPLEFT"
     E.db["unitframe"]["units"]["target"]["buffs"]["attachTo"] = "FRAME"
     E.db["unitframe"]["units"]["target"]["buffs"]["countFont"] = "Exo2-Bold"
@@ -17,10 +16,11 @@ function NoobTacoUI:UnitframeTarget()
     E.db["unitframe"]["units"]["target"]["customTexts"]["TargetHealth"]["fontOutline"] = "NONE"
     E.db["unitframe"]["units"]["target"]["customTexts"]["TargetHealth"]["justifyH"] = "LEFT"
     E.db["unitframe"]["units"]["target"]["customTexts"]["TargetHealth"]["size"] = 15
-    E.db["unitframe"]["units"]["target"]["customTexts"]["TargetHealth"]["text_format"] = "[health:current-percent:shortvalue]"
+    E.db["unitframe"]["units"]["target"]["customTexts"]["TargetHealth"]["text_format"] =
+        "[health:current-percent:shortvalue]"
     E.db["unitframe"]["units"]["target"]["customTexts"]["TargetHealth"]["xOffset"] = 5
     E.db["unitframe"]["units"]["target"]["customTexts"]["TargetHealth"]["yOffset"] = -10
-    -- 
+    --
     E.db["unitframe"]["units"]["target"]["customTexts"]["TargetLevel"]["attachTextTo"] = "Health"
     E.db["unitframe"]["units"]["target"]["customTexts"]["TargetLevel"]["enable"] = true
     E.db["unitframe"]["units"]["target"]["customTexts"]["TargetLevel"]["font"] = "Exo2-Bold"