fixed provisioning profile stuff
resolved conflicts