fix bug from merge conflicts