Added project Resolve: a merge conflict resolver for provisioning profile conflicts