Merge local with updates