add cancan
merge