Resolve conflict
Fix Poisoned and Crippled