merge local branch
fixed merge conflict
cancan permissions fixed and bug-free