Fixed conflicts between permission fields
User and Admin instead of can edit/can view