merge new changes