diff --git a/package.json b/package.json
index 2fa11e32..64f6e583 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,7 @@
 	"name": "ffxiv-ember-overlay",
 	"description": "React + Redux overlay for the OverlayPlugin and ACTWebSocket plugins for Advanced Combat Tracker for use with Final Fantasy XIV.",
 	"license": "GPL-3.0-only",
-<<<<<<< HEAD
 	"version": "1.9.5",
-=======
-	"version": "1.9.3",
->>>>>>> 264c286 (fix(ffxiv): update buff, debuff, and DOT jobs)
 	"keywords": [
 		"ffxiv",
 		"dawntrail",
diff --git a/src/data/game/effects.json b/src/data/game/effects.json
index 2037a907..14c2c2c5 100644
--- a/src/data/game/effects.json
+++ b/src/data/game/effects.json
@@ -46312,9 +46312,7 @@
 		"type" : "effect",
 		"dot" : false,
 		"debuff" : false,
-		"jobs" : [
-			"SAM"
-		],
+		"jobs" : [],
 		"locales" : {
 			"name" : {
 				"en" : "Tengentsu's Foresight",