Resolving minor merge conflict.

src/main/java/com/gmail/nossr50/skills/archery/Archery.java

@@ -56,12 +56,12 @@ public class Archery {
      * @param entity The entity hit by the arrows
      */
     public static void arrowRetrievalCheck(LivingEntity livingEntity) {
-        for (Iterator<TrackedEntity> it = trackedEntities.iterator() ; it.hasNext() ; ) {
-            TrackedEntity trackedEntity = it.next();
+        for (Iterator<TrackedEntity> entityIterator = trackedEntities.iterator(); entityIterator.hasNext(); ) {
+            TrackedEntity trackedEntity = entityIterator.next();
 
-            if (trackedEntity.getLivingEntity() == livingEntity) {
+            if (trackedEntity.getLivingEntity().getEntityId() == livingEntity.getEntityId()) {
                 Misc.dropItems(livingEntity.getLocation(), new ItemStack(Material.ARROW), trackedEntity.getArrowCount());
-                it.remove();
+                entityIterator.remove();
                 return;
             }
         }

src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java

@@ -403,14 +403,14 @@ public class Fishing {
                 }
                 break;
 
-            case SQUID:
+            case SQUID:
                 ItemStack item;
                 try {
                     item = (new MaterialData(Material.INK_SACK, DyeColor.BLACK.getDyeData())).toItemStack(1);
                 }
 		catch(Exception e) {
                     item = (new MaterialData(Material.INK_SACK, (byte) 0)).toItemStack(1);
-                }
+                }
 
                 Misc.dropItem(location, item);
                 break;