Merging with serve-side changes