apply cancan
resolve merge conflict