new changes merge