fix pbkdf2 merge