Add deadly skills
Add killing history to skills
Fix conflicts
Fix conflicts