Emphasize two factor - Resolving merge conflicts

PR to resolve merge conflicts.  @scub, if you can merge this into your PR for Emphasize Two Factor, we should be able to get that change published.