enable to build and fix conflict of previous merge

Signed-off-by: Kazusa Okuda <klamathcatalyst@gmail.com>