Merge new changes