fix bug from do merge