fixed bug from merge conflict