Merge all new changes