fix cancan
Merge branch 'cancangem'