fix combo list bug
merge