Merging in deadly_skills