Added fireworks sound and dryslap plus death song
Fixed conflict when mergin