ReplicatedPG: fix merge errors