fix merge fail, remove double declaration of circuit breaker