change url and password
fix merge conflict