fix the remove error
merge code