added burn to firebolt
merged conflicts