Fixes errors from improper rebase/merge
Fixes errors from improper rebase/merge

kyuhojeong/ipop-tap,birdyhuang/ipop-tap,ipop-project/ipop-tap,kyuhojeong/ipop-tap,birdyhuang/ipop-tap,ipop-project/ipop-tap