fixing conflicts

This should fix the "Overridden" issue. Also, added the CMS administrator role and permissions