Add effects of powerups
resolve conflicts
fix conflicts