merging new updates