added deadly skills
added deadly skills
resolved conflict