this was my fault for messing up the pr attempting to resolve the conflicts, im so stupid smh

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java

@@ -96,7 +96,7 @@ public class Command_cage extends FreedomCommand
             fPlayer.getCageData().cage(location, outerMaterial, innerMaterial);
         }
         player.setGameMode(GameMode.SURVIVAL);
-
+        if (outerMaterial == Material.PLAYER_HEAD)
         {
             FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
         }

src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java

@@ -56,6 +56,7 @@ public class ItemFun extends FreedomService
 
         switch (event.getMaterial())
         {
+            case TROPICAL_FISH:
             {
                 final int RADIUS_HIT = 5;
                 final int STRENGTH = 4;