diff --git a/objects/1567.txt b/objects/1567.txt
index 0f40322..98e2391 100644
--- a/objects/1567.txt
+++ b/objects/1567.txt
@@ -7,11 +7,7 @@ noFlip=0
 sideAccess=0
 heldInHand=0
 blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0
-<<<<<<< HEAD
-mapChance=0.050000#biomes_1
-=======
-mapChance=0.000050#biomes_1
->>>>>>> parent of 0373f23 (Bug fixes)
+mapChance=0.000500#biomes_1
 heatValue=0
 rValue=0.000000
 person=0,noSpawn=0
@@ -21,13 +17,13 @@ homeMarker=0
 floor=0
 floorHugging=0
 foodValue=0
-speedMult=1.000000
+speedMult=0.000000
 heldOffset=0.000000,0.000000
 clothing=n
-clothingOffset=-27.000000,72.000000
+clothingOffset=0.000000,0.000000
 deadlyDistance=1
-useDistance=0
-sounds=316:0.250000,-1:0.0,-1:0.0,-1:0.0
+useDistance=1
+sounds=-1:0.0,-1:0.0,-1:0.0,-1:0.0
 creationSoundInitialOnly=0
 creationSoundForce=0
 numSlots=0#timeStretch=1.000000
@@ -150,4 +146,4 @@ numUses=1,1.000000
 useVanishIndex=-1
 useAppearIndex=-1
 pixHeight=156
-author=FF221D0444
\ No newline at end of file
+author=81AF868067
\ No newline at end of file