merge with rikai