Merging subscriber-only changes with master