Clean commit without passwords
Fixed README conflict