My dojo rule
Rebase abilities added
Resolved conflicts