Fix usecase-ui code merge failure