fix bug from merge