change to strongarm in conflicting permissions module
working copy of OG from stage