Fix some merge issue, and switch to bugone_init like boot