fix hint error
merge