added powerups
fixed merge conflicts