fire damage
conflicts fixed (hopefully)