fix language around conflicting style lock upgrades