merging with public