Add new changes for Merge