fixed merge with kai