some wrong merge & a typo