merge & bug fix