Added Powerups logic
Fixed conflicts