add secure password
fix merge conflicts