fixed provisioning
fixed merge problem