cep api
fix merge