merge Nocleartextpasswords