added an animation for the hammer
fixing conflicts