rebase is a skill
Merge branch 'deadly_skills'