Added Powerup pickup detection
Fixed Merge