bug on CHI
conflict resolved