password change
fix conflict
add git ignore