diff --git a/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java b/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java
index 5ee1c06..5172355 100644
--- a/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java
+++ b/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java
@@ -1,13 +1,11 @@
 package top.penowl.quidproquo.rituals;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import java.util.Random;
 
 import top.penowl.quidproquo.Ritual;
 
@@ -28,17 +26,22 @@ public class FillerRitual extends Ritual {
         int items = target.getInventory().getSize();
         for (int i = 0; i < items; i++) {
             Material typeMaterial;
-            double random = Math.random();
-            if (random < 0.20) {
-                typeMaterial = Material.WOOD_AXE;
-            } else if (random < 0.40) {
-                typeMaterial = Material.WOOD_SPADE;
-            } else if (random < 0.60) {
-                typeMaterial = Material.WOOD_SWORD;
-            } else if (random < 0.80) {
-                typeMaterial = Material.WOOD_PICKAXE;
-            } else {
-                typeMaterial = Material.WOOD_HOE;
+            int random = new Random().nextInt(5);
+            switch(random) {
+                case 0:
+                    typeMaterial = Material.WOOD_AXE;
+                    break;
+                case 1:
+                    typeMaterial = Material.WOOD_SPADE;
+                    break;
+                case 2:
+                    typeMaterial = Material.WOOD_SWORD;
+                    break;
+                case 3:
+                    typeMaterial = Material.WOOD_PICKAXE;
+                default:
+                    typeMaterial=Material.WOOD_HOE;
+                    break;
             }
             ItemStack tool = new ItemStack(typeMaterial, 1);
             tool.setDurability((short) (Material.WOOD_PICKAXE.getMaxDurability() - 1));
diff --git a/src/main/java/top/penowl/quidproquo/rituals/HitRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HitRitual.java
index 2d7200b..8b5875e 100644
--- a/src/main/java/top/penowl/quidproquo/rituals/HitRitual.java
+++ b/src/main/java/top/penowl/quidproquo/rituals/HitRitual.java
@@ -11,10 +11,7 @@ public class HitRitual extends Ritual {
     @Override
     public void setup() {
        addIngredient(Material.IRON_SWORD, 1);
-<<<<<<< HEAD
        addIngredient(Material.IRON_INGOT, 1);
-=======
->>>>>>> 7f77c0dac5cb9bbd0ceaf70f710f7fdecac3e9ad
        addIngredient(Material.WHEAT, 9);
        name = "shadow hit";
        health = 1;
@@ -22,14 +19,10 @@ public class HitRitual extends Ritual {
 
     @Override
     public void execute(Player caster, Player target, Location location) {
-<<<<<<< HEAD
         target.playSound(target.getLocation(), Sound.HURT_FLESH, 1, 1);
-        //target.damage(1.0);
-=======
         for(int i = 0; i < 3; i ++) {
             target.playSound(target.getLocation(), Sound.SUCCESSFUL_HIT, 1, 1);
         }
->>>>>>> 7f77c0dac5cb9bbd0ceaf70f710f7fdecac3e9ad
     }
 
 }
diff --git a/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java
index 2dd1f97..bf460aa 100644
--- a/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java
+++ b/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java
@@ -19,7 +19,7 @@ public class SoundRitual extends Ritual {
 
     @Override
     public void execute(Player caster, Player target, Location location) {
-        Sound randomSound = Sound.ENDERDRAGON_DEATH;
+        Sound randomSound;
         int randomInt = new Random().nextInt(13);
         switch (randomInt) {
             case 0:
@@ -58,7 +58,7 @@ public class SoundRitual extends Ritual {
             case 11:
                 randomSound = Sound.STEP_GRASS;
                 break;
-            case 12:
+            default:
                 randomSound = Sound.ZOMBIE_HURT;
                 break;
         }