Bug 25313: Add skip_merge to ModAuthority