The new password length went lost in the merge conflict