minor typo bug
fix minor conflic after merge