add hi
fix merge
add dog
fix merge
add password