fix: can not register
merge code