added explosion and upgrade assets
fixed merge conflicts