Fixes merge conflict from the verbiage updates