Added in fire to hard difficulty
fixed merge conflicts