[Kimchi-devel] [wok 1/2] Fix merge of patch 01