add a decorator
conflict