fix
hide/show password button
fix conflict version of files