Fixes merge conflict and makes minor adjustments

TItle

code/modules/projectiles/guns/magic/motivation.dm

@@ -8,7 +8,7 @@
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	fire_sound = 'sound/weapons/judgementhit.ogg'
 	ammo_type = /obj/item/ammo_casing/magic/judgement_cut
-	force = 10
+	force = 20
 	armour_penetration = 50
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = ITEM_SLOT_BELT

code/modules/projectiles/projectile/special/judgement_cut.dm

@@ -2,7 +2,7 @@
 	name = "judgement cut"
 	icon_state = "judgement_fire"
 	hitsound = 'sound/weapons/judgementfire.ogg'
-	damage = 5
+	damage = 10
 	damage_type = BRUTE
 	range = 30
 	is_reflectable = FALSE